From ec097975d066fa3f31bfcb512f95131e686ea356 Mon Sep 17 00:00:00 2001 From: nabinhait Date: Fri, 1 Jul 2011 13:34:41 +0530 Subject: [PATCH] restructured erpnext and deleted unwanted --- Dependencies | 4 - INSTALL.txt => INSTALL | 0 .../Delivery Note-Receivable Voucher.txt | 0 .../Project-Receivable Voucher.txt | 0 .../Purchase Order-Payable Voucher.txt | 0 .../Purchase Receipt-Payable Voucher.txt | 0 .../Sales Order-Receivable Voucher.txt | 0 accounts/Module Def/Accounts/Accounts.txt | 99 +- .../Accounts Manager/Accounts Manager.txt | 0 .../Role/Accounts User/Accounts User.txt | 0 accounts/doctype/account/account.txt | 968 +---- .../account_balance/account_balance.txt | 414 +- .../doctype/accounts_setup/accounts_setup.js | 3 - .../doctype/accounts_setup/accounts_setup.py | 43 - .../doctype/accounts_setup/accounts_setup.txt | 1 - .../advance_adjustment_detail.txt | 111 +- .../advance_allocation_detail.txt | 142 +- .../bank_reconciliation.txt | 166 +- .../bank_reconciliation_detail.txt | 114 +- .../doctype/budget_control/budget_control.txt | 32 +- .../doctype/budget_detail/budget_detail.txt | 99 +- .../budget_distribution.txt | 167 +- .../budget_distribution_detail.txt | 79 +- accounts/doctype/cost_center/cost_center.txt | 299 +- accounts/doctype/fiscal_year/fiscal_year.txt | 210 +- accounts/doctype/form_16a/form_16a.txt | 1145 +---- .../form_16a_ack_detail.txt | 64 +- .../form_16a_tax_detail.txt | 151 +- accounts/doctype/gl_control/gl_control.txt | 32 +- accounts/doctype/gl_entry/gl_entry.txt | 324 +- .../journal_voucher/journal_voucher.txt | 1629 +------- .../journal_voucher_detail.txt | 192 +- .../ledger_balance_export.txt | 338 +- .../doctype/ledger_detail/ledger_detail.txt | 97 +- .../mode_of_payment/mode_of_payment.txt | 74 +- .../payable_voucher/payable_voucher.txt | 2516 ++--------- .../period_closing_voucher.txt | 293 +- accounts/doctype/pos_setting/pos_setting.txt | 301 +- .../purchase_tax_detail.txt | 247 +- .../pv_add_tax_detail/pv_add_tax_detail.txt | 1 - .../pv_ded_tax_detail/pv_ded_tax_detail.txt | 1 - accounts/doctype/pv_detail/pv_detail.txt | 530 +-- .../receivable_voucher/receivable_voucher.txt | 2940 ++----------- accounts/doctype/rv_detail/rv_detail.txt | 803 +--- .../doctype/rv_tax_detail/rv_tax_detail.txt | 217 +- .../supplier_tds_category_detail.txt | 1 - .../doctype/tds_category/tds_category.txt | 307 +- .../tds_category_account.txt | 67 +- accounts/doctype/tds_control/tds_control.txt | 32 +- accounts/doctype/tds_detail/tds_detail.txt | 134 +- accounts/doctype/tds_payment/tds_payment.txt | 1673 ++------ .../tds_payment_detail/tds_payment_detail.txt | 119 +- .../doctype/tds_rate_chart/tds_rate_chart.txt | 305 +- .../tds_rate_detail/tds_rate_detail.txt | 89 +- .../tds_return_acknowledgement.txt | 129 +- .../accounts_browser/accounts_browser.txt | 45 +- .../financial_statements.txt | 59 +- ...t___inputs_rg_23_a___part_ii_wrong_one.txt | 37 - .../budget_variance_report1.js | 9 - .../budget_variance_report1.py | 88 - .../budget_variance_report1.sql | 1 - .../budget_variance_report1.txt | 37 - analysis/doctype/mis_control/mis_control.txt | 32 +- analysis/doctype/ta_control/ta_control.txt | 33 +- .../Payable Voucher/Payable Voucher.txt | 1 - .../Receivable Voucher/Receivable Voucher.txt | 1 - .../Application Internal.txt | 218 - .../doctype/code_editor/code_editor.js | 204 - .../doctype/code_editor/code_editor.py | 73 - .../doctype/code_editor/code_editor.txt | 1 - .../doctype/code_history/code_history.txt | 1 - .../doctype_property_setter.txt | 1 - .../doctype/documentation/documentation.txt | 1 - .../doctype/form_settings/form_settings.js | 25 - .../doctype/form_settings/form_settings.py | 54 - .../doctype/form_settings/form_settings.txt | 1 - .../doctype/gl_mapper/gl_mapper.txt | 1 - .../gl_mapper_detail/gl_mapper_detail.txt | 1 - .../impact_analysis/impact_analysis.txt | 1 - application_internal/doctype/mail/mail.txt | 1 - .../mail_participant_details.txt | 1 - .../doctype/menu_control/menu_control.txt | 1 - .../doctype/message/message.txt | 1 - .../message_control/message_control.py | 307 -- .../message_control/message_control.txt | 1 - .../doctype/module_setter/module_setter.py | 25 - .../doctype/module_setter/module_setter.txt | 1 - .../module_tip_control/module_tip_control.py | 34 - .../module_tip_control/module_tip_control.txt | 1 - .../multiple_transfer/multiple_transfer.js | 158 - .../multiple_transfer/multiple_transfer.py | 159 - .../multiple_transfer/multiple_transfer.txt | 1 - .../password_control/password_control.py | 40 - .../password_control/password_control.txt | 1 - .../doctype/patch_util/patch_util.txt | 1 - .../payroll_tips_common.js | 78 - .../payroll_tips_common.txt | 1 - .../production_tips_common.txt | 1 - .../profile_control/profile_control.txt | 55 - .../report_field_detail.txt | 1 - .../report_filter_detail.txt | 1 - .../doctype/sso_control/sso_control.txt | 1 - .../doctype/tips_common/tips_common.js | 87 - .../doctype/tips_common/tips_common.txt | 1 - .../transfer_account/transfer_account.txt | 1 - .../transfer_control/transfer_control.js | 140 - .../transfer_control/transfer_control.py | 249 -- .../transfer_control/transfer_control.txt | 1 - .../transfer_module/transfer_module.txt | 1 - .../wn_account_control/wn_account_control.py | 44 - .../wn_account_control/wn_account_control.txt | 1 - .../wn_erp_client_control.txt | 1 - .../Indent-Purchase Order.txt | 0 .../Sales Order-Indent/Sales Order-Indent.txt | 0 .../Module Def/Buying/Buying.txt | 140 +- .../Purchase Manager/Purchase Manager.txt | 0 .../Purchase Master Manager.txt | 0 .../Role/Purchase User/Purchase User.txt | 0 {roles => buying}/Role/Supplier/Supplier.txt | 0 .../accounts_setup => buying}/__init__.py | 0 .../doctype}/__init__.py | 0 .../doctype/indent}/__init__.py | 0 {srm => buying}/doctype/indent/indent.js | 18 - {srm => buying}/doctype/indent/indent.py | 8 +- buying/doctype/indent/indent.txt | 551 +++ .../doctype/indent_detail}/__init__.py | 0 .../doctype/indent_detail/indent_detail.txt | 275 ++ .../doctype/po_detail}/__init__.py | 0 buying/doctype/po_detail/po_detail.txt | 434 ++ .../po_raw_material_detail}/__init__.py | 0 .../po_raw_material_detail.txt | 153 + .../pr_raw_material_detail}/__init__.py | 0 .../pr_raw_material_detail.txt | 191 + .../doctype/purchase_common}/__init__.py | 0 .../purchase_common/purchase_common.js | 0 .../purchase_common/purchase_common.py | 3 +- .../purchase_common/purchase_common.txt | 31 + .../doctype/purchase_order}/__init__.py | 0 .../doctype/purchase_order/purchase_order.js | 0 .../doctype/purchase_order/purchase_order.py | 0 .../doctype/purchase_order/purchase_order.txt | 1123 +++++ .../purchase_other_charges}/__init__.py | 0 .../purchase_other_charges.js | 0 .../purchase_other_charges.py | 0 .../purchase_other_charges.txt | 123 + .../doctype/qa_inspection_report}/__init__.py | 0 .../qa_inspection_report.js | 0 .../qa_inspection_report.py | 0 .../qa_inspection_report.txt | 359 ++ .../qa_specification_detail}/__init__.py | 0 .../qa_specification_detail.txt | 188 + .../raw_materials_supplied}/__init__.py | 0 .../raw_materials_supplied.txt | 148 + .../doctype/supplier}/__init__.py | 0 {srm => buying}/doctype/supplier/supplier.js | 0 {srm => buying}/doctype/supplier/supplier.py | 0 buying/doctype/supplier/supplier.txt | 349 ++ .../doctype/supplier_quotation}/__init__.py | 0 .../supplier_quotation/supplier_quotation.js | 0 .../supplier_quotation/supplier_quotation.py | 0 .../supplier_quotation/supplier_quotation.txt | 607 +++ .../page}/__init__.py | 0 .../search_criteria}/__init__.py | 0 .../itemwise_purchase_details}/__init__.py | 0 .../itemwise_purchase_details.js | 0 .../itemwise_purchase_details.txt | 0 .../itemwise_receipt_details}/__init__.py | 0 .../itemwise_receipt_details.js | 0 .../itemwise_receipt_details.txt | 0 .../pending_po_items_to_bill}/__init__.py | 0 .../pending_po_items_to_bill.js | 0 .../pending_po_items_to_bill.txt | 0 .../pending_po_items_to_receive}/__init__.py | 0 .../pending_po_items_to_receive.js | 0 .../pending_po_items_to_receive.py | 0 .../pending_po_items_to_receive.txt | 0 .../purchase_in_transit}/__init__.py | 0 .../purchase_in_transit.js | 0 .../purchase_in_transit.py | 0 .../purchase_in_transit.txt | 0 crm/doctype/campaign/campaign.txt | 1 - crm/doctype/customer/customer.txt | 1205 ------ crm/doctype/enquiry/enquiry.txt | 1529 ------- .../enquiry_attachment_detail.txt | 1 - crm/doctype/enquiry_detail/enquiry_detail.txt | 1 - crm/doctype/follow_up/follow_up.txt | 197 - crm/doctype/industry_type/industry_type.txt | 1 - .../installation_note/installation_note.txt | 1205 ------ .../installed_item_details.txt | 1 - crm/doctype/lead/lead.txt | 1840 --------- crm/doctype/plot_control/plot_control.txt | 1 - crm/doctype/quotation/quotation.txt | 2929 ------------- .../quotation_detail/quotation_detail.txt | 1 - crm/doctype/return_detail/return_detail.txt | 370 -- crm/doctype/sales_common/sales_common.txt | 1 - crm/doctype/sales_order/sales_order.txt | 3276 --------------- .../sales_order_detail/sales_order_detail.txt | 1037 ----- crm/doctype/sales_team/sales_team.txt | 1 - .../shipping_address/shipping_address.txt | 406 -- crm/doctype/sms_center/sms_center.txt | 486 --- crm/page/sales_browser/sales_browser.txt | 1 - crm/page/sales_dashboard/sales_dashboard.txt | 1 - .../so_pending_items_3/so_pending_items_3.txt | 37 - .../company_control/company_control.txt | 69 +- home/doctype/feed/feed.txt | 223 +- home/doctype/home_control/home_control.py | 2 +- home/doctype/home_control/home_control.txt | 90 +- .../doctype/widget_control/widget_control.txt | 64 +- home/page/event_updates/event_updates.txt | 47 +- home/page/my_company/my_company.py | 2 +- home/page/my_company/my_company.txt | 83 +- .../profile_settings/profile_settings.txt | 45 +- .../Deduction Type/Income Tax/Income Tax.txt | 0 .../Professional Tax/Professional Tax.txt | 0 .../Provident Fund/Provident Fund.txt | 0 .../KRA Template-Appraisal.txt | 0 .../Salary Structure-Salary Slip.txt | 0 {payroll => hr}/Earning Type/Basic/Basic.txt | 0 .../House Rent Allowance.txt | 0 {payroll => hr}/Expense Type/Calls/Calls.txt | 0 {payroll => hr}/Expense Type/Food/Food.txt | 0 .../Expense Type/Medical/Medical.txt | 0 .../Expense Type/Others/Others.txt | 0 .../Expense Type/Travel/Travel.txt | 0 .../Leave Type/Casual Leave/Casual Leave.txt | 0 .../Compensatory Off/Compensatory Off.txt | 0 .../Leave Without Pay/Leave Without Pay.txt | 0 .../Privilege Leave/Privilege Leave.txt | 0 .../Leave Type/Sick Leave/Sick Leave.txt | 0 .../Payroll.txt => hr/Module Def/HR/HR.txt | 540 ++- {roles => hr}/Role/Employee/Employee.txt | 0 {roles => hr}/Role/HR Manager/HR Manager.txt | 0 {roles => hr}/Role/HR User/HR User.txt | 0 .../doctype/module_setter => hr}/__init__.py | 0 .../doctype}/__init__.py | 0 .../doctype/absent_days_detail}/__init__.py | 0 .../absent_days_detail/absent_days_detail.txt | 137 + .../doctype/appraisal}/__init__.py | 0 .../doctype/appraisal/appraisal.js | 0 .../doctype/appraisal/appraisal.py | 0 hr/doctype/appraisal/appraisal.txt | 415 ++ .../doctype/appraisal_detail}/__init__.py | 0 .../appraisal_detail/appraisal_detail.txt | 112 + .../doctype/attendance}/__init__.py | 0 .../doctype/attendance/attendance.js | 0 .../doctype/attendance/attendance.py | 0 hr/doctype/attendance/attendance.txt | 226 + .../attendance_control_panel}/__init__.py | 0 .../attendance_control_panel.js | 0 .../attendance_control_panel.py | 0 .../attendance_control_panel.txt | 229 + .../doctype/branch}/__init__.py | 0 .../doctype/branch/branch.js | 0 hr/doctype/branch/branch.txt | 104 + .../doctype/chapter_vi_a_detail}/__init__.py | 0 .../chapter_vi_a_detail.txt | 145 + .../doctype/declaration_detail}/__init__.py | 0 .../declaration_detail/declaration_detail.txt | 144 + .../doctype/deduction_detail}/__init__.py | 0 .../deduction_detail/deduction_detail.txt | 77 + .../doctype/deduction_type}/__init__.py | 0 .../doctype/deduction_type/deduction_type.js | 0 hr/doctype/deduction_type/deduction_type.txt | 115 + .../doctype/department}/__init__.py | 0 .../doctype/department/department.js | 0 hr/doctype/department/department.txt | 102 + .../doctype/designation}/__init__.py | 0 .../doctype/designation/designation.js | 0 hr/doctype/designation/designation.txt | 102 + .../earn_deduction_detail}/__init__.py | 0 .../earn_deduction_detail.txt | 116 + .../doctype/earning_detail}/__init__.py | 0 hr/doctype/earning_detail/earning_detail.txt | 80 + .../doctype/earning_type}/__init__.py | 0 .../doctype/earning_type/earning_type.js | 0 hr/doctype/earning_type/earning_type.txt | 147 + .../educational_qualifications}/__init__.py | 0 .../educational_qualifications.txt | 117 + .../__init__.py | 0 .../educational_qualifications_detail.txt | 109 + .../doctype/employee}/__init__.py | 0 {payroll => hr}/doctype/employee/employee.js | 0 {payroll => hr}/doctype/employee/employee.py | 0 hr/doctype/employee/employee.txt | 1105 +++++ .../doctype/employee_profile}/__init__.py | 0 .../employee_profile/employee_profile.js | 0 .../employee_profile/employee_profile.py | 0 .../employee_profile/employee_profile.txt | 0 .../doctype/employment_type}/__init__.py | 0 .../employment_type/employment_type.js | 0 .../employment_type/employment_type.txt | 102 + .../doctype/expense_type}/__init__.py | 0 .../doctype/expense_type/expense_type.js | 0 hr/doctype/expense_type/expense_type.txt | 101 + .../doctype/expense_voucher}/__init__.py | 0 .../expense_voucher/expense_voucher.js | 0 .../expense_voucher/expense_voucher.py | 0 .../expense_voucher/expense_voucher.txt | 439 ++ .../expense_voucher_detail}/__init__.py | 0 .../expense_voucher_detail.txt | 108 + .../experience_in_company_detail}/__init__.py | 0 .../experience_in_company_detail.txt | 110 + .../doctype/grade}/__init__.py | 0 .../__init__.py => hr/doctype/grade/grade.js | 0 hr/doctype/grade/grade.txt | 103 + .../doctype/holiday_list}/__init__.py | 0 .../doctype/holiday_list/holiday_list.js | 0 .../doctype/holiday_list/holiday_list.py | 0 hr/doctype/holiday_list/holiday_list.txt | 167 + .../doctype/holiday_list_detail}/__init__.py | 0 .../holiday_list_detail.txt | 65 + .../invest_80_declaration_detail}/__init__.py | 0 .../invest_80_declaration_detail.txt | 143 + .../doctype/it_checklist}/__init__.py | 0 .../doctype/it_checklist/it_checklist.js | 0 .../doctype/it_checklist/it_checklist.py | 0 hr/doctype/it_checklist/it_checklist.txt | 637 +++ .../doctype/kra_sheet}/__init__.py | 0 hr/doctype/kra_sheet/kra_sheet.txt | 68 + .../doctype/kra_template}/__init__.py | 0 .../doctype/kra_template/kra_template.js | 0 hr/doctype/kra_template/kra_template.txt | 115 + .../doctype/leave_allocation}/__init__.py | 0 .../leave_allocation/leave_allocation.js | 0 .../leave_allocation/leave_allocation.py | 0 .../leave_allocation/leave_allocation.txt | 293 ++ .../doctype/leave_application}/__init__.py | 0 .../leave_application/leave_application.js | 0 .../leave_application/leave_application.py | 0 .../leave_application/leave_application.txt | 297 ++ .../doctype/leave_control_panel}/__init__.py | 0 .../leave_control_panel.js | 0 .../leave_control_panel.py | 0 .../leave_control_panel.txt | 244 ++ .../doctype/leave_type}/__init__.py | 0 .../doctype/leave_type/leave_type.js | 0 hr/doctype/leave_type/leave_type.txt | 152 + .../doctype/other_income_detail}/__init__.py | 0 .../other_income_detail.txt | 141 + .../doctype/payroll_rule}/__init__.py | 0 .../doctype/payroll_rule/payroll_rule.js | 0 .../doctype/payroll_rule/payroll_rule.py | 0 .../doctype/payroll_rule/payroll_rule.txt | 0 .../previous_experience_detail}/__init__.py | 0 .../previous_experience_detail.txt | 127 + .../__init__.py | 0 .../professional_training_details.txt | 100 + .../doctype/salary_slip}/__init__.py | 0 .../doctype/salary_slip/salary_slip.js | 0 .../doctype/salary_slip/salary_slip.py | 0 hr/doctype/salary_slip/salary_slip.txt | 684 +++ .../salary_slip_control_panel}/__init__.py | 0 .../salary_slip_control_panel.js | 0 .../salary_slip_control_panel.py | 0 .../salary_slip_control_panel.txt | 286 ++ .../doctype/salary_structure}/__init__.py | 0 .../salary_structure/salary_structure.js | 0 .../salary_structure/salary_structure.py | 0 .../salary_structure/salary_structure.txt | 483 +++ .../doctype/ss_deduction_detail}/__init__.py | 0 .../ss_deduction_detail.txt | 109 + .../doctype/ss_earning_detail}/__init__.py | 0 .../ss_earning_detail/ss_earning_detail.txt | 110 + .../page}/__init__.py | 0 .../search_criteria}/__init__.py | 0 .../employee_appraisals}/__init__.py | 0 .../employee_appraisals.txt | 0 .../employee_details}/__init__.py | 0 .../employee_details/employee_details.txt | 0 .../__init__.py | 0 .../employee_in_company_experience.txt | 0 .../employee_information}/__init__.py | 0 .../employee_information.py | 0 .../employee_information.txt | 0 .../employees_birthday}/__init__.py | 0 .../employees_birthday/employees_birthday.txt | 0 .../__init__.py | 0 .../employeewise_balance_leave_report.js | 0 .../employeewise_balance_leave_report.py | 0 .../employeewise_balance_leave_report.txt | 0 .../__init__.py | 0 ...employeewise_leave_transaction_details.txt | 0 .../expense_vouchers}/__init__.py | 0 .../expense_vouchers/expense_vouchers.txt | 0 .../monthly_attendance_details}/__init__.py | 0 .../monthly_attendance_details.js | 0 .../monthly_attendance_details.py | 0 .../monthly_attendance_details.sql | 0 .../monthly_attendance_details.txt | 0 .../monthly_salary_register}/__init__.py | 0 .../monthly_salary_register.txt | 0 .../__init__.py | 0 .../new_or_left_employees_for_a_month.js | 0 .../new_or_left_employees_for_a_month.py | 0 .../new_or_left_employees_for_a_month.txt | 0 .../pending_appraisals}/__init__.py | 0 .../pending_appraisals/pending_appraisals.js | 0 .../pending_appraisals/pending_appraisals.txt | 0 .../pending_expense_vouchers}/__init__.py | 0 .../pending_expense_vouchers.js | 0 .../pending_expense_vouchers.txt | 0 .../salary_register}/__init__.py | 0 .../salary_register/salary_register.js | 0 .../salary_register/salary_register.py | 0 .../salary_register/salary_register.txt | 0 .../search_criteria/salary_slips}/__init__.py | 0 .../salary_slips/salary_slips.txt | 0 .../salary_structure_details}/__init__.py | 0 .../salary_structure_details.txt | 0 knowledge_base/doctype/answer/answer.txt | 213 +- knowledge_base/doctype/question/question.txt | 362 +- .../page/question_view/question_view.txt | 35 +- knowledge_base/page/questions/questions.txt | 35 +- .../Module Def/Maintenance/Maintenance.txt | 407 -- .../doctype/customer_issue/customer_issue.txt | 1696 -------- .../item_maintenance_detail.txt | 1 - .../maintenance_schedule.txt | 1051 ----- .../maintenance_schedule_detail.txt | 1 - .../maintenance_visit/maintenance_visit.txt | 1313 ------ .../maintenance_visit_detail.txt | 1 - .../doctype/support_ticket/support_ticket.txt | 1037 ----- .../support_ticket_response.txt | 167 - .../customer_issues1/customer_issues1.txt | 37 - .../warranty_amc_summary1.txt | 37 - .../Enquiry-Service Quotation.txt | 1 - .../Indent-Purchase Order.txt | 1 - .../Sales Order-Maintenance Report.txt | 1 - mapper/Module Def/Mapper/Mapper.txt | 29 - material_management/doctype/batch/batch.txt | 1 - material_management/doctype/bin/bin.txt | 1 - .../doctype/delivery_note/delivery_note.txt | 3672 ----------------- .../delivery_note_detail.txt | 1070 ----- .../delivery_note_packing_detail.txt | 687 --- material_management/doctype/item/item.txt | 2294 ---------- .../item_attachments_detail.txt | 1 - .../item_specification_detail.txt | 1 - .../doctype/item_tax/item_tax.txt | 1 - .../landed_cost_master/landed_cost_master.txt | 1 - .../landed_cost_master_detail.txt | 1 - .../landed_cost_wizard/landed_cost_wizard.txt | 660 --- .../purchase_receipt/purchase_receipt.txt | 3123 -------------- .../purchase_receipt_detail.txt | 1 - .../ref_rate_detail/ref_rate_detail.txt | 1 - .../sales_and_purchase_return_wizard.txt | 1005 ----- .../doctype/sales_bom/sales_bom.txt | 1 - .../sales_bom_detail/sales_bom_detail.txt | 1 - .../doctype/serial_no/serial_no.txt | 1935 --------- .../doctype/stock_entry/stock_entry.txt | 1800 -------- .../stock_entry_detail/stock_entry_detail.txt | 651 --- .../doctype/stock_ledger/stock_ledger.txt | 1 - .../stock_ledger_entry/stock_ledger_entry.txt | 1013 ----- .../stock_reconciliation.txt | 603 --- .../stock_uom_replace_utility.txt | 1 - .../uom_conversion_detail.txt | 1 - .../valuation_control/valuation_control.txt | 1 - .../doctype/warehouse/warehouse.txt | 1 - observers.py | 35 - patches/erpnext_structure_cleanup.py | 164 + patches/{ => old_patches}/customer_address.py | 0 .../doctype_permission_patch.py | 0 patches/{ => old_patches}/feed_patch.py | 0 .../old_patches/replacecode.py | 0 patches/patch.py | 5 +- payroll/Module Def/Payroll/Payroll.js | 9 - .../absent_days_detail/absent_days_detail.txt | 1 - .../doctype/action_detail/action_detail.txt | 1 - payroll/doctype/appraisal/appraisal.txt | 962 ----- .../appraisal_detail/appraisal_detail.txt | 1 - payroll/doctype/attendance/attendance.txt | 523 --- .../attendance_control_panel.txt | 1 - payroll/doctype/branch/branch.js | 0 payroll/doctype/branch/branch.txt | 1 - .../chapter_vi_a_detail.txt | 1 - payroll/doctype/city/city.js | 0 payroll/doctype/city/city.txt | 1 - .../condition_detail/condition_detail.txt | 1 - .../declaration_detail/declaration_detail.txt | 1 - .../deduction_detail/deduction_detail.txt | 160 - .../doctype/deduction_type/deduction_type.js | 0 .../doctype/deduction_type/deduction_type.txt | 1 - payroll/doctype/department/department.js | 0 payroll/doctype/department/department.txt | 1 - payroll/doctype/designation/designation.js | 0 payroll/doctype/designation/designation.txt | 1 - .../earn_deduction_detail.txt | 1 - .../doctype/earning_detail/earning_detail.txt | 160 - payroll/doctype/earning_type/earning_type.js | 0 payroll/doctype/earning_type/earning_type.txt | 1 - .../educational_qualifications.txt | 1 - .../educational_qualifications_detail.txt | 1 - payroll/doctype/employee/employee.txt | 3184 -------------- .../employment_type/employment_type.js | 0 .../employment_type/employment_type.txt | 1 - payroll/doctype/expense_type/expense_type.js | 0 payroll/doctype/expense_type/expense_type.txt | 1 - .../expense_voucher/expense_voucher.txt | 975 ----- .../expense_voucher_detail.txt | 1 - .../experience_in_company_detail.txt | 1 - payroll/doctype/grade/grade.js | 0 payroll/doctype/grade/grade.txt | 1 - payroll/doctype/holiday_list/holiday_list.js | 0 payroll/doctype/holiday_list/holiday_list.txt | 381 -- .../holiday_list_detail.txt | 125 - .../invest_80_declaration_detail.txt | 1 - payroll/doctype/it_checklist/it_checklist.txt | 1 - payroll/doctype/kra_sheet/kra_sheet.txt | 1 - payroll/doctype/kra_template/kra_template.js | 0 payroll/doctype/kra_template/kra_template.txt | 1 - .../leave_allocation/leave_allocation.txt | 637 --- .../leave_applicable_detail.txt | 1 - .../leave_application/leave_application.txt | 782 ---- .../leave_control_panel.txt | 613 --- payroll/doctype/leave_detail/leave_detail.txt | 1 - payroll/doctype/leave_type/leave_type.js | 0 payroll/doctype/leave_type/leave_type.txt | 334 -- .../leave_type_detail/leave_type_detail.txt | 1 - .../other_income_detail.txt | 1 - .../previous_experience_detail.txt | 1 - .../professional_training_details.txt | 1 - payroll/doctype/rule_engine/rule_engine.txt | 1 - payroll/doctype/salary_slip/salary_slip.txt | 1754 -------- .../salary_slip_control_panel.txt | 1 - .../salary_structure/salary_structure.txt | 1188 ------ .../ss_deduction_detail.txt | 218 - .../ss_earning_detail/ss_earning_detail.txt | 218 - .../appraisal_custom/appraisal_custom.txt | 37 - .../datewise_leave_report.txt | 37 - .../datewise_leave_report1.js | 8 - .../datewise_leave_report1.py | 45 - .../datewise_leave_report1.txt | 37 - .../datewise_leave_report2.js | 8 - .../datewise_leave_report2.py | 45 - .../datewise_leave_report2.txt | 37 - .../employee_details1/employee_details1.js | 4 - .../employee_details1/employee_details1.py | 13 - .../employee_details1/employee_details1.txt | 37 - .../employee_details2/employee_details2.js | 4 - .../employee_details2/employee_details2.py | 13 - .../employee_details2/employee_details2.txt | 37 - .../employee_in_company_experience1.txt | 37 - .../employee_in_company_experience2.txt | 37 - .../employees_birthday1.js | 6 - .../employees_birthday1.py | 7 - .../employees_birthday1.txt | 37 - .../installed_items/installed_items.js | 5 - .../installed_items/installed_items.txt | 37 - .../monthly_salary_register1.js | 4 - .../monthly_salary_register1.py | 98 - .../monthly_salary_register1.txt | 37 - .../monthly_salary_register2.js | 4 - .../monthly_salary_register2.py | 98 - .../monthly_salary_register2.txt | 37 - .../salary_slips1/salary_slips1.txt | 37 - .../salary_structure_details3.txt | 37 - .../salary_structure_details4.txt | 37 - .../Production Forecast-Production Plan.txt | 0 ...tion Forecast-Production Planning Tool.txt | 0 .../Sales Order-Production Plan.txt | 0 .../Production Manager/Production Manager.txt | 0 .../Role/Production User/Production User.txt | 0 .../bill_of_materials/bill_of_materials.txt | 1114 +---- .../doctype/bom_control/bom_control.txt | 32 +- .../doctype/bom_material/bom_material.txt | 340 +- .../doctype/bom_operation/bom_operation.txt | 173 +- .../bom_replace_utility.txt | 399 +- .../bom_replace_utility_detail.txt | 105 +- .../bom_report_detail/bom_report_detail.txt | 162 +- .../flat_bom_detail/flat_bom_detail.txt | 217 +- production/doctype/pf_detail/pf_detail.txt | 217 +- production/doctype/pp_detail/pp_detail.txt | 249 +- .../doctype/pp_so_detail/pp_so_detail.txt | 132 +- production/doctype/ppw_detail/ppw_detail.txt | 53 +- production/doctype/pro_detail/pro_detail.txt | 158 +- .../doctype/pro_pp_detail/pro_pp_detail.txt | 130 +- .../production_control/production_control.txt | 32 +- .../production_order/production_order.txt | 468 ++- .../production_planning_tool.txt | 331 +- .../update_delivery_date.txt | 736 +--- .../update_delivery_date_detail.txt | 142 +- .../doctype/workstation/workstation.txt | 285 +- .../bill_of_materials/bill_of_materials.txt | 59 +- .../Role/Projects User/Projects User.txt | 0 .../doctype/activity_type/activity_type.txt | 170 +- projects/doctype/project/project.txt | 1040 +---- .../project_activity/project_activity.txt | 176 +- .../project_activity_update.txt | 64 +- .../project_control/project_control.txt | 31 +- .../project_milestone/project_milestone.txt | 85 +- projects/doctype/ticket/ticket.txt | 1401 +------ projects/doctype/timesheet/timesheet.txt | 512 +-- .../timesheet_detail/timesheet_detail.txt | 296 +- projects/page/projects/projects.txt | 28 +- .../projectwise_delivered_qty_and_costs1.js | 16 - .../projectwise_delivered_qty_and_costs1.txt | 37 - .../projectwise_delivered_qty_and_costs2.txt | 37 - .../projectwise_pending_qty_and_costs1.js | 15 - .../projectwise_pending_qty_and_costs1.txt | 37 - .../projectwise_pending_qty_and_costs2.js | 15 - .../projectwise_pending_qty_and_costs2.txt | 37 - roles/Module Def/Roles/Roles.txt | 71 - roles/Role/Administrator/Administrator.txt | 1 - roles/Role/All/All.txt | 1 - roles/Role/Guest/Guest.txt | 1 - roles/doctype/role/role.txt | 1 - .../Delivery Note-Installation Note.txt | 0 .../Enquiry-Quotation/Enquiry-Quotation.txt | 0 .../Lead-Customer/Lead-Customer.txt | 0 .../Lead-Enquiry/Lead-Enquiry.txt | 0 .../Project-Sales Order.txt | 0 .../Quotation-Sales Order.txt | 0 .../Module Def/Selling/Selling.txt | 429 +- {roles => selling}/Role/Customer/Customer.txt | 0 {roles => selling}/Role/Partner/Partner.txt | 0 .../Role/Sales Manager/Sales Manager.txt | 0 .../Sales Master Manager.txt | 0 .../Role/Sales User/Sales User.txt | 0 .../customer_issue => selling}/__init__.py | 0 .../doctype}/__init__.py | 0 .../doctype/campaign}/__init__.py | 0 {crm => selling}/doctype/campaign/campaign.js | 0 selling/doctype/campaign/campaign.txt | 168 + .../doctype/customer}/__init__.py | 0 {crm => selling}/doctype/customer/customer.js | 0 {crm => selling}/doctype/customer/customer.py | 0 selling/doctype/customer/customer.txt | 485 +++ .../doctype/enquiry}/__init__.py | 0 {crm => selling}/doctype/enquiry/enquiry.js | 0 {crm => selling}/doctype/enquiry/enquiry.py | 0 selling/doctype/enquiry/enquiry.txt | 657 +++ .../doctype/enquiry_detail}/__init__.py | 0 .../doctype/enquiry_detail/enquiry_detail.txt | 145 + .../doctype/enquiry_sms_detail}/__init__.py | 0 .../enquiry_sms_detail/enquiry_sms_detail.txt | 0 .../doctype/follow_up}/__init__.py | 0 selling/doctype/follow_up/follow_up.txt | 94 + .../doctype/industry_type}/__init__.py | 0 .../doctype/industry_type/industry_type.js | 0 .../doctype/industry_type/industry_type.txt | 89 + .../doctype/installation_note}/__init__.py | 0 .../installation_note/installation_note.js | 0 .../installation_note/installation_note.py | 2 +- .../installation_note/installation_note.txt | 478 +++ .../installed_item_details}/__init__.py | 0 .../installed_item_details.txt | 159 + .../doctype/lead}/__init__.py | 0 {crm => selling}/doctype/lead/lead.js | 0 {crm => selling}/doctype/lead/lead.py | 0 selling/doctype/lead/lead.txt | 787 ++++ .../lead_attachment_detail}/__init__.py | 0 .../lead_attachment_detail.txt | 0 .../doctype/lead_item_detail}/__init__.py | 0 .../lead_item_detail/lead_item_detail.txt | 0 .../doctype/lead_sms_detail}/__init__.py | 0 .../lead_sms_detail/lead_sms_detail.txt | 0 .../doctype/plot_control}/__init__.py | 0 .../doctype/plot_control/plot_control.py | 0 selling/doctype/plot_control/plot_control.txt | 30 + .../doctype/quotation}/__init__.py | 0 .../doctype/quotation/quotation.js | 0 .../doctype/quotation/quotation.py | 0 selling/doctype/quotation/quotation.txt | 1274 ++++++ .../doctype/quotation_detail}/__init__.py | 0 .../quotation_detail/quotation_detail.txt | 347 ++ .../doctype/return_detail}/__init__.py | 0 .../doctype/return_detail/return_detail.txt | 150 + .../doctype/sales_common}/__init__.py | 0 .../doctype/sales_common/sales_common.js | 0 .../doctype/sales_common/sales_common.py | 0 selling/doctype/sales_common/sales_common.txt | 31 + .../doctype/sales_order}/__init__.py | 0 .../doctype/sales_order/sales_order.js | 0 .../doctype/sales_order/sales_order.py | 0 selling/doctype/sales_order/sales_order.txt | 1371 ++++++ .../doctype/sales_order_detail}/__init__.py | 0 .../sales_order_detail/sales_order_detail.txt | 515 +++ .../doctype/sales_team}/__init__.py | 0 selling/doctype/sales_team/sales_team.txt | 135 + .../doctype/shipping_address}/__init__.py | 0 .../shipping_address/shipping_address.js | 0 .../shipping_address/shipping_address.py | 0 .../shipping_address/shipping_address.txt | 193 + .../doctype/sms_center}/__init__.py | 0 .../doctype/sms_center/sms_center.js | 0 .../doctype/sms_center/sms_center.py | 0 selling/doctype/sms_center/sms_center.txt | 195 + .../page}/__init__.py | 0 .../page/customers}/__init__.py | 0 .../page/customers/customers.html | 0 {crm => selling}/page/customers/customers.js | 0 {crm => selling}/page/customers/customers.txt | 0 .../page/sales_browser}/__init__.py | 0 .../page/sales_browser/sales_browser.html | 0 .../page/sales_browser/sales_browser.js | 0 selling/page/sales_browser/sales_browser.txt | 51 + .../page/sales_dashboard}/__init__.py | 0 .../page/sales_dashboard/sales_dashboard.html | 0 .../page/sales_dashboard/sales_dashboard.js | 0 .../page/sales_dashboard/sales_dashboard.txt | 44 + .../search_criteria}/__init__.py | 0 .../__init__.py | 0 .../delivered_items_to_be_install.js | 0 .../delivered_items_to_be_install.txt | 0 .../__init__.py | 0 ...delivery_note_itemwise_pending_to_bill.txt | 0 .../draft_sales_orders}/__init__.py | 0 .../draft_sales_orders/draft_sales_orders.js | 0 .../draft_sales_orders/draft_sales_orders.txt | 0 .../follow_up_report}/__init__.py | 0 .../follow_up_report/follow_up_report.js | 0 .../follow_up_report/follow_up_report.py | 0 .../follow_up_report/follow_up_report.txt | 0 .../search_criteria/gross_profit}/__init__.py | 0 .../gross_profit/gross_profit.js | 0 .../gross_profit/gross_profit.py | 0 .../gross_profit/gross_profit.txt | 0 .../itemwise_delivery_details}/__init__.py | 0 .../itemwise_delivery_details.js | 0 .../itemwise_delivery_details.py | 0 .../itemwise_delivery_details.txt | 0 .../itemwise_sales_details}/__init__.py | 0 .../itemwise_sales_details.js | 0 .../itemwise_sales_details.py | 0 .../itemwise_sales_details.txt | 0 .../monthly_despatched_trend}/__init__.py | 0 .../monthly_despatched_trend.js | 0 .../monthly_despatched_trend.py | 0 .../monthly_despatched_trend.txt | 0 .../periodic_sales_summary}/__init__.py | 0 .../periodic_sales_summary.js | 0 .../periodic_sales_summary.txt | 0 .../sales_agentwise_commission}/__init__.py | 0 .../sales_agentwise_commission.js | 0 .../sales_agentwise_commission.py | 0 .../sales_agentwise_commission.txt | 0 .../sales_order_pending_items1}/__init__.py | 0 .../sales_order_pending_items1.js | 0 .../sales_order_pending_items1.txt | 0 .../search_criteria/sales_orderwise_booking_ | 0 .../__init__.py | 0 ...s_orderwise_booking_&_delivery_summary.txt | 0 .../__init__.py | 0 .../sales_orderwise_pending_amount_to_bill.js | 0 ...sales_orderwise_pending_amount_to_bill.txt | 0 .../__init__.py | 0 ...sales_orderwise_pending_qty_to_deliver.txt | 0 .../__init__.py | 0 ...persons_target_variance_item_group_wise.js | 0 ...persons_target_variance_item_group_wise.py | 0 ...ersons_target_variance_item_group_wise.txt | 0 .../__init__.py | 0 .../sales_personwise_transaction_summary.js | 0 .../sales_personwise_transaction_summary.py | 0 .../sales_personwise_transaction_summary.txt | 0 .../target_variance_report}/__init__.py | 0 .../target_variance_report.js | 0 .../target_variance_report.py | 0 .../target_variance_report.txt | 0 .../__init__.py | 0 ...itories_target_variance_item_group_wise.js | 0 ...itories_target_variance_item_group_wise.py | 0 ...tories_target_variance_item_group_wise.txt | 0 .../territory_item_group_wise_gp}/__init__.py | 0 .../territory_item_group_wise_gp.py | 0 .../territory_item_group_wise_gp.txt | 0 .../__init__.py | 0 .../territory_sales___variance_report.js | 0 .../territory_sales___variance_report.py | 0 .../territory_sales___variance_report.txt | 0 .../total_target_variance_report}/__init__.py | 0 .../total_target_variance_report.js | 0 .../total_target_variance_report.py | 0 .../total_target_variance_report.sql | 0 .../total_target_variance_report.txt | 0 .../variance_report}/__init__.py | 0 .../variance_report/variance_report.js | 0 .../variance_report/variance_report.py | 0 .../variance_report/variance_report.sql | 0 .../variance_report/variance_report.txt | 0 settings/Module Def/Settings/Settings.txt | 218 - .../authorization_control.txt | 1 - .../authorization_rule/authorization_rule.txt | 1 - .../doctype/email_settings/email_settings.txt | 1 - settings/doctype/naming_series/__init__.py | 0 .../doctype/naming_series/naming_series.txt | 1 - .../doctype/notification_control/__init__.py | 0 .../notification_control.txt | 1 - .../doctype/permission_control/__init__.py | 0 .../permission_control/permission_control.txt | 1 - settings/doctype/print_heading/__init__.py | 0 .../doctype/print_heading/print_heading.txt | 1 - settings/doctype/series_detail/__init__.py | 0 .../doctype/series_detail/series_detail.txt | 1 - .../doctype/setup_wizard_control/__init__.py | 0 .../setup_wizard_control.txt | 1 - settings/doctype/sms_settings/__init__.py | 0 .../doctype/sms_settings/sms_settings.txt | 320 -- .../static_parameter_detail/__init__.py | 0 .../static_parameter_detail.txt | 131 - settings/doctype/update_series/__init__.py | 0 .../doctype/update_series/update_series.txt | 1 - .../workflow_action_detail/__init__.py | 0 .../workflow_action_detail.txt | 1 - settings/doctype/workflow_engine/__init__.py | 0 .../workflow_engine/workflow_engine.txt | 1 - settings/doctype/workflow_rule/__init__.py | 0 .../doctype/workflow_rule/workflow_rule.txt | 710 ---- .../doctype/workflow_rule_detail/__init__.py | 0 .../workflow_rule_detail.txt | 1 - .../Role/System Manager/System Manager.txt | 0 .../authorization_control}/__init__.py | 0 .../authorization_control.js | 0 .../authorization_control.py | 0 .../authorization_control.txt | 30 + .../doctype/authorization_rule}/__init__.py | 0 .../authorization_rule/authorization_rule.js | 0 .../authorization_rule/authorization_rule.py | 0 .../authorization_rule/authorization_rule.txt | 223 + setup/doctype/brand/brand.txt | 165 +- setup/doctype/company/company.txt | 816 +--- .../contact_control/contact_control.txt | 89 +- setup/doctype/country/country.txt | 101 +- setup/doctype/currency/currency.txt | 96 +- .../doctype/customer_group/customer_group.txt | 244 +- .../doctype/email_settings}/__init__.py | 0 .../doctype/email_settings/email_settings.js | 0 .../doctype/email_settings/email_settings.py | 0 .../doctype/email_settings/email_settings.txt | 125 + setup/doctype/erp_setup/__init__.py | 0 setup/doctype/erp_setup/erp_setup.js | 3 - setup/doctype/erp_setup/erp_setup.py | 131 - setup/doctype/erp_setup/erp_setup.txt | 1 - .../import_data_control.txt | 31 +- setup/doctype/item_group/item_group.txt | 263 +- .../doctype/manage_account/manage_account.txt | 1510 +------ .../doctype/market_segment/market_segment.txt | 81 +- .../doctype/naming_series}/__init__.py | 0 .../doctype/naming_series/naming_series.js | 0 .../doctype/naming_series/naming_series.py | 0 setup/doctype/naming_series/naming_series.txt | 206 + .../naming_series_options.txt | 83 +- .../doctype/notification_control}/__init__.py | 0 .../notification_control.js | 0 .../notification_control.py | 0 .../notification_control.txt | 330 ++ .../order_lost_reason/order_lost_reason.txt | 98 +- setup/doctype/other_charges/other_charges.txt | 205 +- setup/doctype/period/period.txt | 123 +- .../doctype/period_control/period_control.txt | 33 +- .../doctype/permission_control}/__init__.py | 0 .../permission_control/permission_control.py | 0 .../permission_control/permission_control.txt | 33 + setup/doctype/personalize/personalize.txt | 215 +- setup/doctype/price_list/price_list.txt | 335 +- .../doctype/print_heading}/__init__.py | 0 .../doctype/print_heading/print_heading.js | 0 .../doctype/print_heading/print_heading.py | 0 setup/doctype/print_heading/print_heading.txt | 103 + .../doctype/role}/__init__.py | 0 {roles => setup}/doctype/role/role.js | 0 {roles => setup}/doctype/role/role.py | 0 setup/doctype/role/role.txt | 114 + .../sales_browser_control.txt | 31 +- setup/doctype/sales_partner/sales_partner.txt | 950 +---- setup/doctype/sales_person/sales_person.txt | 1428 +------ setup/doctype/setup_control/setup_control.txt | 34 +- .../doctype/setup_wizard_control}/__init__.py | 0 .../setup_wizard_control.py | 0 .../setup_wizard_control.txt | 31 + .../doctype/sms_settings}/__init__.py | 0 setup/doctype/sms_settings/sms_settings.txt | 139 + setup/doctype/state/state.txt | 106 +- .../static_parameter_detail}/__init__.py | 0 .../static_parameter_detail.txt | 59 + setup/doctype/supplier_type/supplier_type.txt | 135 +- .../support_email_settings.py | 6 +- .../support_email_settings.txt | 347 +- setup/doctype/target_detail/target_detail.txt | 97 +- setup/doctype/term/term.txt | 173 +- setup/doctype/territory/territory.txt | 296 +- setup/doctype/uom/uom.txt | 146 +- .../doctype/update_series}/__init__.py | 0 setup/doctype/update_series/update_series.txt | 104 + .../doctype/warehouse_type/warehouse_type.txt | 137 +- .../workflow_action_detail}/__init__.py | 0 .../workflow_action_detail.txt | 63 + .../doctype/workflow_engine}/__init__.py | 0 .../workflow_engine/workflow_engine.py | 0 .../workflow_engine/workflow_engine.txt | 31 + .../doctype/workflow_rule}/__init__.py | 0 .../doctype/workflow_rule/workflow_rule.js | 0 .../doctype/workflow_rule/workflow_rule.py | 0 setup/doctype/workflow_rule/workflow_rule.txt | 258 ++ .../doctype/workflow_rule_detail}/__init__.py | 0 .../workflow_rule_detail.txt | 112 + setup/page/import_data/import_data.txt | 116 +- .../permission_engine/permission_engine.txt | 45 +- setup/page/setup/setup.txt | 28 +- setup/page/setup_wizard/setup_wizard.txt | 45 +- setup/page/webforms/webforms.txt | 52 +- .../Purchase Order-Payable Voucher.txt | 1 - .../Purchase Order-Purchase Receipt.txt | 802 ---- .../Purchase Receipt-Payable Voucher.txt | 1 - srm/__init__.py | 0 srm/doctype/__init__.py | 0 srm/doctype/indent/__init__.py | 0 srm/doctype/indent/indent.txt | 1251 ------ srm/doctype/indent_detail/__init__.py | 0 srm/doctype/indent_detail/indent_detail.txt | 582 --- srm/doctype/landed_cost_detail/__init__.py | 0 .../landed_cost_detail/landed_cost_detail.txt | 1 - srm/doctype/lc_pr_detail/__init__.py | 0 srm/doctype/lc_pr_detail/lc_pr_detail.txt | 196 - srm/doctype/po_detail/__init__.py | 0 srm/doctype/po_detail/po_detail.txt | 1 - .../po_raw_material_detail/__init__.py | 0 .../po_raw_material_detail.txt | 1 - .../pr_raw_material_detail/__init__.py | 0 .../pr_raw_material_detail.txt | 1 - srm/doctype/purchase_common/__init__.py | 0 .../purchase_common/purchase_common.txt | 1 - srm/doctype/purchase_order/__init__.py | 0 srm/doctype/purchase_order/purchase_order.txt | 2822 ------------- .../purchase_other_charges/__init__.py | 0 .../purchase_other_charges.txt | 1 - srm/doctype/qa_inspection_report/__init__.py | 0 .../qa_inspection_report.txt | 837 ---- .../qa_specification_detail/__init__.py | 0 .../qa_specification_detail.txt | 1 - .../raw_materials_supplied/__init__.py | 0 .../raw_materials_supplied.txt | 1 - srm/doctype/supplier/__init__.py | 0 srm/doctype/supplier/supplier.txt | 907 ---- srm/doctype/supplier_quotation/__init__.py | 0 .../supplier_quotation/supplier_quotation.txt | 1 - srm/page/__init__.py | 0 srm/search_criteria/__init__.py | 0 .../itemwise_purchase_details/__init__.py | 0 .../itemwise_receipt_details/__init__.py | 0 .../pending_po_items_to_bill/__init__.py | 0 .../pending_po_items_to_receive/__init__.py | 0 .../purchase_in_transit/__init__.py | 0 .../event_handlers.py | 0 .../QA Inspection Report.txt | 0 .../Project-Delivery Note.txt | 0 .../Purchase Order-Purchase Receipt.txt | 0 .../Receivable Voucher-Delivery Note.txt | 0 .../Sales Order-Delivery Note.txt | 0 .../All Item Groups/All Item Groups.txt | 0 .../Item Group/Default/Default.txt | 0 .../Module Def/Stock/Stock.txt | 223 +- .../Purchase Receipt Format.txt | 0 .../Material Manager/Material Manager.txt | 0 .../Material Master Manager.txt | 0 .../Role/Material User/Material User.txt | 0 .../Role/Quality Manager/Quality Manager.txt | 0 .../deduction_type => stock}/__init__.py | 0 .../department => stock/doctype}/__init__.py | 0 .../doctype/batch}/__init__.py | 0 stock/doctype/batch/batch.txt | 158 + .../doctype/bin}/__init__.py | 0 .../doctype/bin/bin.py | 0 stock/doctype/bin/bin.txt | 299 ++ .../doctype/delivery_note}/__init__.py | 0 .../doctype/delivery_note/delivery_note.js | 0 .../doctype/delivery_note/delivery_note.py | 0 stock/doctype/delivery_note/delivery_note.txt | 1510 +++++++ .../doctype/delivery_note/tests.py | 0 .../doctype/delivery_note_detail}/__init__.py | 0 .../delivery_note_detail.txt | 489 +++ .../delivery_note_packing_detail}/__init__.py | 0 .../delivery_note_packing_detail.txt | 285 ++ .../doctype/item}/__init__.py | 0 .../doctype/item/item.js | 0 .../doctype/item/item.py | 0 stock/doctype/item/item.txt | 936 +++++ .../item_specification_detail}/__init__.py | 0 .../item_specification_detail.txt | 66 + .../doctype/item_tax}/__init__.py | 0 stock/doctype/item_tax/item_tax.txt | 66 + .../doctype/landed_cost_detail}/__init__.py | 0 .../landed_cost_detail/landed_cost_detail.txt | 77 + .../doctype/landed_cost_master}/__init__.py | 0 .../landed_cost_master/landed_cost_master.js | 0 .../landed_cost_master/landed_cost_master.txt | 167 + .../landed_cost_master_detail}/__init__.py | 0 .../landed_cost_master_detail.txt | 61 + .../doctype/landed_cost_wizard}/__init__.py | 0 .../landed_cost_wizard/landed_cost_wizard.js | 0 .../landed_cost_wizard/landed_cost_wizard.py | 0 .../landed_cost_wizard/landed_cost_wizard.txt | 232 ++ .../doctype/lc_pr_detail}/__init__.py | 0 stock/doctype/lc_pr_detail/lc_pr_detail.txt | 65 + .../doctype/purchase_receipt}/__init__.py | 0 .../purchase_receipt/purchase_receipt.js | 0 .../purchase_receipt/purchase_receipt.py | 0 .../purchase_receipt/purchase_receipt.txt | 1262 ++++++ .../purchase_receipt_detail}/__init__.py | 0 .../purchase_receipt_detail.txt | 563 +++ .../doctype/ref_rate_detail}/__init__.py | 0 .../ref_rate_detail/ref_rate_detail.txt | 84 + .../__init__.py | 0 .../sales_and_purchase_return_wizard.js | 0 .../sales_and_purchase_return_wizard.py | 0 .../sales_and_purchase_return_wizard.txt | 443 ++ .../doctype/sales_bom}/__init__.py | 0 .../doctype/sales_bom/sales_bom.js | 0 .../doctype/sales_bom/sales_bom.py | 0 stock/doctype/sales_bom/sales_bom.txt | 273 ++ .../doctype/sales_bom_detail}/__init__.py | 0 .../sales_bom_detail/sales_bom_detail.txt | 119 + .../doctype/serial_no}/__init__.py | 0 .../doctype/serial_no/serial_no.js | 0 .../doctype/serial_no/serial_no.py | 0 stock/doctype/serial_no/serial_no.txt | 746 ++++ .../doctype/stock_entry}/__init__.py | 0 .../doctype/stock_entry/stock_entry.js | 0 .../doctype/stock_entry/stock_entry.py | 0 .../doctype/stock_entry/stock_entry.py~ | 0 stock/doctype/stock_entry/stock_entry.txt | 779 ++++ .../doctype/stock_entry_detail}/__init__.py | 0 .../stock_entry_detail/stock_entry_detail.txt | 281 ++ .../doctype/stock_ledger}/__init__.py | 0 .../doctype/stock_ledger/stock_ledger.py | 0 stock/doctype/stock_ledger/stock_ledger.txt | 59 + .../doctype/stock_ledger_entry}/__init__.py | 0 .../stock_ledger_entry/stock_ledger_entry.py | 0 .../stock_ledger_entry/stock_ledger_entry.txt | 447 ++ .../doctype/stock_reconciliation}/__init__.py | 0 .../stock_reconciliation.js | 0 .../stock_reconciliation.py | 0 .../stock_reconciliation.txt | 260 ++ .../stock_uom_replace_utility}/__init__.py | 0 .../stock_uom_replace_utility.js | 0 .../stock_uom_replace_utility.py | 0 .../stock_uom_replace_utility.txt | 161 + .../uom_conversion_detail}/__init__.py | 0 .../uom_conversion_detail.txt | 65 + .../doctype/valuation_control}/__init__.py | 0 .../valuation_control/valuation_control.py | 0 .../valuation_control/valuation_control.py~ | 0 .../valuation_control/valuation_control.txt | 31 + .../doctype/warehouse}/__init__.py | 0 .../doctype/warehouse/warehouse.js | 0 .../doctype/warehouse/warehouse.py | 0 stock/doctype/warehouse/warehouse.txt | 460 +++ .../page}/__init__.py | 0 .../search_criteria}/__init__.py | 0 .../itemwise_price_list}/__init__.py | 0 .../itemwise_price_list.js | 0 .../itemwise_price_list.txt | 0 .../shortage_to_indent}/__init__.py | 0 .../shortage_to_indent/shortage_to_indent.js | 0 .../shortage_to_indent/shortage_to_indent.py | 0 .../shortage_to_indent/shortage_to_indent.txt | 0 .../stock_aging_report}/__init__.py | 0 .../stock_aging_report/stock_aging_report.js | 0 .../stock_aging_report/stock_aging_report.py | 0 .../stock_aging_report/stock_aging_report.txt | 0 .../search_criteria/stock_ledger}/__init__.py | 0 .../stock_ledger/stock_ledger.js | 0 .../stock_ledger/stock_ledger.txt | 0 .../search_criteria/stock_level}/__init__.py | 0 .../stock_level/stock_level.js | 0 .../stock_level/stock_level.py | 0 .../stock_level/stock_level.txt | 0 .../search_criteria/stock_report}/__init__.py | 0 .../stock_report/stock_report.js | 0 .../stock_report/stock_report.py | 0 .../stock_report/stock_report.txt | 0 {material_management => stock}/tests.py | 0 .../DocType Label/Ticket/Ticket.txt | 0 .../Customer Issue-Maintenance Visit.txt | 0 .../Sales Order-Maintenance Schedule.txt | 0 .../Sales Order-Maintenance Visit.txt | 0 support/Module Def/Support/Support.txt | 281 ++ .../Maintenance Manager.txt | 0 .../Maintenance User/Maintenance User.txt | 0 .../Role/Support Manager/Support Manager.txt | 0 .../Role/Support Team/Support Team.txt | 0 {payroll/page => support}/__init__.py | 0 .../doctype}/__init__.py | 0 .../doctype/customer_issue}/__init__.py | 0 .../doctype/customer_issue/customer_issue.js | 0 .../doctype/customer_issue/customer_issue.py | 0 .../doctype/customer_issue/customer_issue.txt | 674 +++ .../item_maintenance_detail}/__init__.py | 0 .../item_maintenance_detail.txt | 184 + .../doctype/maintenance_schedule}/__init__.py | 0 .../maintenance_schedule.js | 0 .../maintenance_schedule.py | 0 .../maintenance_schedule.txt | 419 ++ .../maintenance_schedule_detail}/__init__.py | 0 .../maintenance_schedule_detail.txt | 133 + .../doctype/maintenance_visit}/__init__.py | 0 .../maintenance_visit/maintenance_visit.js | 0 .../maintenance_visit/maintenance_visit.py | 0 .../maintenance_visit/maintenance_visit.txt | 517 +++ .../maintenance_visit_detail}/__init__.py | 0 .../maintenance_visit_detail.txt | 172 + .../doctype/support_ticket/__init__.py | 0 .../doctype/support_ticket/support_ticket.js | 0 .../doctype/support_ticket/support_ticket.py | 0 .../doctype/support_ticket/support_ticket.txt | 419 ++ .../support_ticket_response}/__init__.py | 0 .../support_ticket_response.txt | 67 + .../search_criteria}/__init__.py | 0 .../search_criteria/amc_summary}/__init__.py | 0 .../amc_summary/amc_summary.js | 0 .../amc_summary/amc_summary.py | 0 .../amc_summary/amc_summary.txt | 0 .../customer_issues}/__init__.py | 0 .../customer_issues/customer_issues.js | 0 .../customer_issues/customer_issues.txt | 0 .../__init__.py | 0 ...enance_orderwise_pending_amount_to_bill.js | 0 ...nance_orderwise_pending_amount_to_bill.txt | 0 .../maintenance_schedule_details}/__init__.py | 0 .../maintenance_schedule_details.js | 0 .../maintenance_schedule_details.txt | 0 .../warranty_amc_expiry_details}/__init__.py | 0 .../warranty_amc_expiry_details.js | 0 .../warranty_amc_expiry_details.txt | 0 .../warranty_amc_summary}/__init__.py | 0 .../warranty_amc_summary.js | 0 .../warranty_amc_summary.py | 0 .../warranty_amc_summary.sql | 0 .../warranty_amc_summary.txt | 0 tools/Module Def/Tools/Tools.txt | 358 -- tools/__init__.py | 0 tools/doctype/__init__.py | 0 .../activity_dashboard_control/__init__.py | 0 .../activity_dashboard_control.txt | 1 - tools/doctype/address/__init__.py | 0 tools/doctype/address/address.txt | 802 ---- tools/doctype/business_letter/__init__.py | 0 .../business_letter/business_letter.js | 38 - .../business_letter/business_letter.py | 29 - .../business_letter/business_letter.txt | 1 - .../business_letter_template/__init__.py | 0 .../business_letter_template.js | 10 - .../business_letter_template.txt | 1 - .../doctype/business_letter_type/__init__.py | 0 .../business_letter_type.js | 10 - .../business_letter_type.txt | 1 - tools/doctype/contact/__init__.py | 0 tools/doctype/contact/contact.txt | 786 ---- tools/doctype/contact_detail/__init__.py | 0 .../doctype/contact_detail/contact_detail.txt | 1 - .../doctype/file_browser_control/__init__.py | 0 .../file_browser_control.txt | 55 - tools/doctype/rating_template/__init__.py | 0 .../rating_template/rating_template.txt | 1 - .../rating_template_detail/__init__.py | 0 .../rating_template_detail.txt | 1 - .../doctype/rating_widget_control/__init__.py | 0 .../rating_widget_control.py | 51 - .../rating_widget_control.txt | 1 - .../doctype/rating_widget_record/__init__.py | 0 .../rating_widget_record.txt | 1 - tools/doctype/receiver_detail/__init__.py | 0 .../receiver_detail/receiver_detail.txt | 1 - tools/doctype/rename_tool/__init__.py | 0 tools/doctype/rename_tool/rename_tool.txt | 225 - tools/doctype/reposting_tool/__init__.py | 0 .../doctype/reposting_tool/reposting_tool.txt | 1 - tools/doctype/sms_control/__init__.py | 0 tools/doctype/sms_control/sms_control.txt | 101 - tools/doctype/sms_log/__init__.py | 0 tools/doctype/sms_log/sms_log.txt | 1 - tools/doctype/todo_item/__init__.py | 0 tools/doctype/todo_item/todo_item.txt | 1 - tools/doctype/trash_control/__init__.py | 0 tools/doctype/trash_control/trash_control.txt | 1 - tools/doctype/tweet/__init__.py | 0 tools/doctype/tweet/tweet.txt | 1 - tools/doctype/while_you_were_out/__init__.py | 0 .../while_you_were_out/while_you_were_out.txt | 1 - tools/doctype/wiki_control/__init__.py | 0 tools/doctype/wiki_control/wiki_control.py | 32 - tools/doctype/wiki_control/wiki_control.txt | 1 - tools/doctype/wiki_history/__init__.py | 0 tools/doctype/wiki_history/wiki_history.txt | 1 - tools/doctype/wiki_page/__init__.py | 0 tools/doctype/wiki_page/wiki_page.txt | 1 - tools/page/__init__.py | 0 tools/page/file_browser/__init__.py | 0 tools/page/file_browser/file_browser.txt | 194 - tools/page/messages/__init__.py | 0 tools/page/trash/__init__.py | 0 tools/page/trash/trash.txt | 1 - tools/page/wip_monitor/__init__.py | 0 tools/page/wip_monitor/wip_monitor.txt | 1 - .../doctype}/__init__.py | 0 .../activity_dashboard_control}/__init__.py | 0 .../activity_dashboard_control.py | 0 .../activity_dashboard_control.txt | 30 + .../doctype/address}/__init__.py | 0 .../doctype/address/address.js | 0 .../doctype/address/address.py | 0 utilities/doctype/address/address.txt | 306 ++ .../doctype/contact}/__init__.py | 0 .../doctype/contact/contact.js | 0 .../doctype/contact/contact.py | 0 utilities/doctype/contact/contact.txt | 339 ++ .../doctype/contact_detail}/__init__.py | 0 .../doctype/contact_detail/contact_detail.txt | 98 + .../doctype/doctype_label}/__init__.py | 0 .../doctype/doctype_label/doctype_label.txt | 0 .../doctype_property_setter}/__init__.py | 0 .../doctype_property_setter.py | 0 .../doctype_property_setter.txt | 138 + .../doctype/file_browser_control}/__init__.py | 0 .../file_browser_control.py | 0 .../file_browser_control.txt | 31 + .../doctype/gl_mapper}/__init__.py | 0 utilities/doctype/gl_mapper/gl_mapper.txt | 98 + .../doctype/gl_mapper_detail}/__init__.py | 0 .../gl_mapper_detail/gl_mapper_detail.txt | 225 + .../doctype/menu_control}/__init__.py | 0 .../doctype/menu_control/menu_control.js | 0 .../doctype/menu_control/menu_control.py | 0 .../doctype/menu_control/menu_control.txt | 31 + .../doctype/patch_util}/__init__.py | 0 .../doctype/patch_util/patch_util.py | 0 utilities/doctype/patch_util/patch_util.txt | 30 + .../production_tips_common}/__init__.py | 0 .../production_tips_common.js | 0 .../production_tips_common.txt | 30 + .../doctype/profile_control}/__init__.py | 0 .../profile_control/profile_control.py | 0 .../profile_control/profile_control.txt | 31 + .../doctype/receiver_detail}/__init__.py | 0 .../receiver_detail/receiver_detail.txt | 72 + .../doctype/rename_tool}/__init__.py | 0 .../doctype/rename_tool/rename_tool.js | 0 .../doctype/rename_tool/rename_tool.py | 0 utilities/doctype/rename_tool/rename_tool.txt | 102 + .../doctype/reposting_tool}/__init__.py | 0 .../doctype/reposting_tool/reposting_tool.js | 0 .../doctype/reposting_tool/reposting_tool.py | 0 .../doctype/reposting_tool/reposting_tool.txt | 96 + .../doctype/sms_center}/__init__.py | 0 .../doctype/sms_center/sms_center.js | 0 .../doctype/sms_center/sms_center.py | 0 .../doctype/sms_center/sms_center.txt | 0 .../doctype/sms_control}/__init__.py | 0 .../doctype/sms_control/sms_control.js | 0 .../doctype/sms_control/sms_control.py | 0 utilities/doctype/sms_control/sms_control.txt | 59 + .../doctype/sms_log}/__init__.py | 0 utilities/doctype/sms_log/sms_log.txt | 130 + .../doctype/sso_control}/__init__.py | 0 .../doctype/sso_control/sso_control.py | 0 utilities/doctype/sso_control/sso_control.txt | 30 + .../doctype/todo_item}/__init__.py | 0 utilities/doctype/todo_item/todo_item.txt | 142 + .../doctype/trash_control}/__init__.py | 0 .../doctype/trash_control/trash_control.py | 0 .../doctype/trash_control/trash_control.txt | 32 + .../wn_erp_client_control}/__init__.py | 0 .../wn_erp_client_control.py | 0 .../wn_erp_client_control.txt | 124 + {settings => utilities/page}/__init__.py | 0 .../page/file_browser}/__init__.py | 0 .../page/file_browser/file_browser.html | 0 .../page/file_browser/file_browser.js | 0 utilities/page/file_browser/file_browser.txt | 121 + .../page/messages}/__init__.py | 0 .../page/messages/messages.html | 0 .../page/messages/messages.js | 0 .../page/messages/messages.txt | 0 .../page/messages/messages_static.html | 0 .../page/trash}/__init__.py | 0 {tools => utilities}/page/trash/trash.html | 0 {tools => utilities}/page/trash/trash.js | 0 utilities/page/trash/trash.txt | 72 + .../page/wip_monitor}/__init__.py | 0 .../page/wip_monitor/wip_monitor.html | 0 .../page/wip_monitor/wip_monitor.js | 0 utilities/page/wip_monitor/wip_monitor.txt | 28 + 1280 files changed, 54494 insertions(+), 88652 deletions(-) delete mode 100755 Dependencies rename INSTALL.txt => INSTALL (100%) rename {mapper => accounts}/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt (100%) rename {mapper => accounts}/DocType Mapper/Project-Receivable Voucher/Project-Receivable Voucher.txt (100%) rename {mapper => accounts}/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt (100%) rename {mapper => accounts}/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt (100%) rename {mapper => accounts}/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt (100%) rename {roles => accounts}/Role/Accounts Manager/Accounts Manager.txt (100%) rename {roles => accounts}/Role/Accounts User/Accounts User.txt (100%) delete mode 100644 accounts/doctype/accounts_setup/accounts_setup.js delete mode 100644 accounts/doctype/accounts_setup/accounts_setup.py delete mode 100644 accounts/doctype/accounts_setup/accounts_setup.txt delete mode 100644 accounts/doctype/pv_add_tax_detail/pv_add_tax_detail.txt delete mode 100644 accounts/doctype/pv_ded_tax_detail/pv_ded_tax_detail.txt delete mode 100644 accounts/doctype/supplier_tds_category_detail/supplier_tds_category_detail.txt delete mode 100644 accounts/search_criteria/account___inputs_rg_23_a___part_ii_wrong_one/account___inputs_rg_23_a___part_ii_wrong_one.txt delete mode 100644 accounts/search_criteria/budget_variance_report1/budget_variance_report1.js delete mode 100644 accounts/search_criteria/budget_variance_report1/budget_variance_report1.py delete mode 100644 accounts/search_criteria/budget_variance_report1/budget_variance_report1.sql delete mode 100644 accounts/search_criteria/budget_variance_report1/budget_variance_report1.txt delete mode 100644 application_internal/DocType Label/Payable Voucher/Payable Voucher.txt delete mode 100644 application_internal/DocType Label/Receivable Voucher/Receivable Voucher.txt delete mode 100644 application_internal/Module Def/Application Internal/Application Internal.txt delete mode 100644 application_internal/doctype/code_editor/code_editor.js delete mode 100644 application_internal/doctype/code_editor/code_editor.py delete mode 100644 application_internal/doctype/code_editor/code_editor.txt delete mode 100644 application_internal/doctype/code_history/code_history.txt delete mode 100644 application_internal/doctype/doctype_property_setter/doctype_property_setter.txt delete mode 100644 application_internal/doctype/documentation/documentation.txt delete mode 100644 application_internal/doctype/form_settings/form_settings.js delete mode 100644 application_internal/doctype/form_settings/form_settings.py delete mode 100644 application_internal/doctype/form_settings/form_settings.txt delete mode 100644 application_internal/doctype/gl_mapper/gl_mapper.txt delete mode 100644 application_internal/doctype/gl_mapper_detail/gl_mapper_detail.txt delete mode 100644 application_internal/doctype/impact_analysis/impact_analysis.txt delete mode 100644 application_internal/doctype/mail/mail.txt delete mode 100644 application_internal/doctype/mail_participant_details/mail_participant_details.txt delete mode 100644 application_internal/doctype/menu_control/menu_control.txt delete mode 100644 application_internal/doctype/message/message.txt delete mode 100644 application_internal/doctype/message_control/message_control.py delete mode 100644 application_internal/doctype/message_control/message_control.txt delete mode 100644 application_internal/doctype/module_setter/module_setter.py delete mode 100644 application_internal/doctype/module_setter/module_setter.txt delete mode 100644 application_internal/doctype/module_tip_control/module_tip_control.py delete mode 100644 application_internal/doctype/module_tip_control/module_tip_control.txt delete mode 100644 application_internal/doctype/multiple_transfer/multiple_transfer.js delete mode 100644 application_internal/doctype/multiple_transfer/multiple_transfer.py delete mode 100644 application_internal/doctype/multiple_transfer/multiple_transfer.txt delete mode 100644 application_internal/doctype/password_control/password_control.py delete mode 100644 application_internal/doctype/password_control/password_control.txt delete mode 100644 application_internal/doctype/patch_util/patch_util.txt delete mode 100644 application_internal/doctype/payroll_tips_common/payroll_tips_common.js delete mode 100644 application_internal/doctype/payroll_tips_common/payroll_tips_common.txt delete mode 100644 application_internal/doctype/production_tips_common/production_tips_common.txt delete mode 100644 application_internal/doctype/profile_control/profile_control.txt delete mode 100644 application_internal/doctype/report_field_detail/report_field_detail.txt delete mode 100644 application_internal/doctype/report_filter_detail/report_filter_detail.txt delete mode 100644 application_internal/doctype/sso_control/sso_control.txt delete mode 100644 application_internal/doctype/tips_common/tips_common.js delete mode 100644 application_internal/doctype/tips_common/tips_common.txt delete mode 100644 application_internal/doctype/transfer_account/transfer_account.txt delete mode 100644 application_internal/doctype/transfer_control/transfer_control.js delete mode 100644 application_internal/doctype/transfer_control/transfer_control.py delete mode 100644 application_internal/doctype/transfer_control/transfer_control.txt delete mode 100644 application_internal/doctype/transfer_module/transfer_module.txt delete mode 100644 application_internal/doctype/wn_account_control/wn_account_control.py delete mode 100644 application_internal/doctype/wn_account_control/wn_account_control.txt delete mode 100644 application_internal/doctype/wn_erp_client_control/wn_erp_client_control.txt rename {srm => buying}/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt (100%) rename {mapper => buying}/DocType Mapper/Sales Order-Indent/Sales Order-Indent.txt (100%) rename srm/Module Def/SRM/SRM.txt => buying/Module Def/Buying/Buying.txt (69%) rename {roles => buying}/Role/Purchase Manager/Purchase Manager.txt (100%) rename {roles => buying}/Role/Purchase Master Manager/Purchase Master Manager.txt (100%) rename {roles => buying}/Role/Purchase User/Purchase User.txt (100%) rename {roles => buying}/Role/Supplier/Supplier.txt (100%) rename {accounts/doctype/accounts_setup => buying}/__init__.py (100%) rename {accounts/doctype/pv_add_tax_detail => buying/doctype}/__init__.py (100%) rename {accounts/doctype/pv_ded_tax_detail => buying/doctype/indent}/__init__.py (100%) rename {srm => buying}/doctype/indent/indent.js (90%) rename {srm => buying}/doctype/indent/indent.py (97%) create mode 100644 buying/doctype/indent/indent.txt rename {accounts/doctype/supplier_tds_category_detail => buying/doctype/indent_detail}/__init__.py (100%) create mode 100644 buying/doctype/indent_detail/indent_detail.txt rename {accounts/search_criteria/account___inputs_rg_23_a___part_ii_wrong_one => buying/doctype/po_detail}/__init__.py (100%) create mode 100644 buying/doctype/po_detail/po_detail.txt rename {accounts/search_criteria/budget_variance_report1 => buying/doctype/po_raw_material_detail}/__init__.py (100%) create mode 100644 buying/doctype/po_raw_material_detail/po_raw_material_detail.txt rename {application_internal => buying/doctype/pr_raw_material_detail}/__init__.py (100%) create mode 100644 buying/doctype/pr_raw_material_detail/pr_raw_material_detail.txt rename {application_internal/doctype => buying/doctype/purchase_common}/__init__.py (100%) rename {srm => buying}/doctype/purchase_common/purchase_common.js (100%) rename {srm => buying}/doctype/purchase_common/purchase_common.py (99%) create mode 100644 buying/doctype/purchase_common/purchase_common.txt rename {application_internal/doctype/code_editor => buying/doctype/purchase_order}/__init__.py (100%) rename {srm => buying}/doctype/purchase_order/purchase_order.js (100%) rename {srm => buying}/doctype/purchase_order/purchase_order.py (100%) create mode 100644 buying/doctype/purchase_order/purchase_order.txt rename {application_internal/doctype/code_history => buying/doctype/purchase_other_charges}/__init__.py (100%) rename {srm => buying}/doctype/purchase_other_charges/purchase_other_charges.js (100%) rename {srm => buying}/doctype/purchase_other_charges/purchase_other_charges.py (100%) create mode 100644 buying/doctype/purchase_other_charges/purchase_other_charges.txt rename {application_internal/doctype/doctype_label => buying/doctype/qa_inspection_report}/__init__.py (100%) rename {srm => buying}/doctype/qa_inspection_report/qa_inspection_report.js (100%) rename {srm => buying}/doctype/qa_inspection_report/qa_inspection_report.py (100%) create mode 100644 buying/doctype/qa_inspection_report/qa_inspection_report.txt rename {application_internal/doctype/doctype_property_setter => buying/doctype/qa_specification_detail}/__init__.py (100%) create mode 100644 buying/doctype/qa_specification_detail/qa_specification_detail.txt rename {application_internal/doctype/documentation => buying/doctype/raw_materials_supplied}/__init__.py (100%) create mode 100644 buying/doctype/raw_materials_supplied/raw_materials_supplied.txt rename {application_internal/doctype/form_settings => buying/doctype/supplier}/__init__.py (100%) rename {srm => buying}/doctype/supplier/supplier.js (100%) rename {srm => buying}/doctype/supplier/supplier.py (100%) create mode 100644 buying/doctype/supplier/supplier.txt rename {application_internal/doctype/gl_mapper => buying/doctype/supplier_quotation}/__init__.py (100%) mode change 100644 => 100755 rename {srm => buying}/doctype/supplier_quotation/supplier_quotation.js (100%) rename {srm => buying}/doctype/supplier_quotation/supplier_quotation.py (100%) create mode 100755 buying/doctype/supplier_quotation/supplier_quotation.txt rename {application_internal/doctype/gl_mapper_detail => buying/page}/__init__.py (100%) rename {application_internal/doctype/impact_analysis => buying/search_criteria}/__init__.py (100%) rename {application_internal/doctype/mail => buying/search_criteria/itemwise_purchase_details}/__init__.py (100%) rename {srm => buying}/search_criteria/itemwise_purchase_details/itemwise_purchase_details.js (100%) rename {srm => buying}/search_criteria/itemwise_purchase_details/itemwise_purchase_details.txt (100%) rename {application_internal/doctype/mail_participant_details => buying/search_criteria/itemwise_receipt_details}/__init__.py (100%) rename {srm => buying}/search_criteria/itemwise_receipt_details/itemwise_receipt_details.js (100%) rename {srm => buying}/search_criteria/itemwise_receipt_details/itemwise_receipt_details.txt (100%) rename {application_internal/doctype/menu_control => buying/search_criteria/pending_po_items_to_bill}/__init__.py (100%) rename {srm => buying}/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.js (100%) rename {srm => buying}/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt (100%) rename {application_internal/doctype/message => buying/search_criteria/pending_po_items_to_receive}/__init__.py (100%) rename {srm => buying}/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.js (100%) rename {srm => buying}/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.py (100%) rename {srm => buying}/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt (100%) rename {application_internal/doctype/message_control => buying/search_criteria/purchase_in_transit}/__init__.py (100%) rename {srm => buying}/search_criteria/purchase_in_transit/purchase_in_transit.js (100%) rename {srm => buying}/search_criteria/purchase_in_transit/purchase_in_transit.py (100%) rename {srm => buying}/search_criteria/purchase_in_transit/purchase_in_transit.txt (100%) delete mode 100644 crm/doctype/campaign/campaign.txt delete mode 100644 crm/doctype/customer/customer.txt delete mode 100644 crm/doctype/enquiry/enquiry.txt delete mode 100644 crm/doctype/enquiry_attachment_detail/enquiry_attachment_detail.txt delete mode 100644 crm/doctype/enquiry_detail/enquiry_detail.txt delete mode 100644 crm/doctype/follow_up/follow_up.txt delete mode 100644 crm/doctype/industry_type/industry_type.txt delete mode 100644 crm/doctype/installation_note/installation_note.txt delete mode 100644 crm/doctype/installed_item_details/installed_item_details.txt delete mode 100644 crm/doctype/lead/lead.txt delete mode 100644 crm/doctype/plot_control/plot_control.txt delete mode 100644 crm/doctype/quotation/quotation.txt delete mode 100644 crm/doctype/quotation_detail/quotation_detail.txt delete mode 100644 crm/doctype/return_detail/return_detail.txt delete mode 100644 crm/doctype/sales_common/sales_common.txt delete mode 100644 crm/doctype/sales_order/sales_order.txt delete mode 100644 crm/doctype/sales_order_detail/sales_order_detail.txt delete mode 100644 crm/doctype/sales_team/sales_team.txt delete mode 100755 crm/doctype/shipping_address/shipping_address.txt delete mode 100644 crm/doctype/sms_center/sms_center.txt delete mode 100644 crm/page/sales_browser/sales_browser.txt delete mode 100644 crm/page/sales_dashboard/sales_dashboard.txt delete mode 100644 crm/search_criteria/so_pending_items_3/so_pending_items_3.txt rename {payroll => hr}/Deduction Type/Income Tax/Income Tax.txt (100%) rename {payroll => hr}/Deduction Type/Professional Tax/Professional Tax.txt (100%) rename {payroll => hr}/Deduction Type/Provident Fund/Provident Fund.txt (100%) rename {mapper => hr}/DocType Mapper/KRA Template-Appraisal/KRA Template-Appraisal.txt (100%) rename {mapper => hr}/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt (100%) rename {payroll => hr}/Earning Type/Basic/Basic.txt (100%) rename {payroll => hr}/Earning Type/House Rent Allowance/House Rent Allowance.txt (100%) rename {payroll => hr}/Expense Type/Calls/Calls.txt (100%) rename {payroll => hr}/Expense Type/Food/Food.txt (100%) rename {payroll => hr}/Expense Type/Medical/Medical.txt (100%) rename {payroll => hr}/Expense Type/Others/Others.txt (100%) rename {payroll => hr}/Expense Type/Travel/Travel.txt (100%) rename {payroll => hr}/Leave Type/Casual Leave/Casual Leave.txt (100%) rename {payroll => hr}/Leave Type/Compensatory Off/Compensatory Off.txt (100%) rename {payroll => hr}/Leave Type/Leave Without Pay/Leave Without Pay.txt (100%) rename {payroll => hr}/Leave Type/Privilege Leave/Privilege Leave.txt (100%) rename {payroll => hr}/Leave Type/Sick Leave/Sick Leave.txt (100%) rename payroll/Module Def/Payroll/Payroll.txt => hr/Module Def/HR/HR.txt (68%) rename {roles => hr}/Role/Employee/Employee.txt (100%) rename {roles => hr}/Role/HR Manager/HR Manager.txt (100%) rename {roles => hr}/Role/HR User/HR User.txt (100%) rename {application_internal/doctype/module_setter => hr}/__init__.py (100%) rename {application_internal/doctype/module_tip_control => hr/doctype}/__init__.py (100%) rename {application_internal/doctype/multiple_transfer => hr/doctype/absent_days_detail}/__init__.py (100%) create mode 100644 hr/doctype/absent_days_detail/absent_days_detail.txt rename {application_internal/doctype/password_control => hr/doctype/appraisal}/__init__.py (100%) rename {payroll => hr}/doctype/appraisal/appraisal.js (100%) rename {payroll => hr}/doctype/appraisal/appraisal.py (100%) create mode 100644 hr/doctype/appraisal/appraisal.txt rename {application_internal/doctype/patch_util => hr/doctype/appraisal_detail}/__init__.py (100%) create mode 100644 hr/doctype/appraisal_detail/appraisal_detail.txt rename {application_internal/doctype/payroll_tips_common => hr/doctype/attendance}/__init__.py (100%) rename {payroll => hr}/doctype/attendance/attendance.js (100%) rename {payroll => hr}/doctype/attendance/attendance.py (100%) create mode 100644 hr/doctype/attendance/attendance.txt rename {application_internal/doctype/production_tips_common => hr/doctype/attendance_control_panel}/__init__.py (100%) rename {payroll => hr}/doctype/attendance_control_panel/attendance_control_panel.js (100%) rename {payroll => hr}/doctype/attendance_control_panel/attendance_control_panel.py (100%) create mode 100644 hr/doctype/attendance_control_panel/attendance_control_panel.txt rename {application_internal/doctype/profile_control => hr/doctype/branch}/__init__.py (100%) rename application_internal/doctype/report_field_detail/__init__.py => hr/doctype/branch/branch.js (100%) create mode 100644 hr/doctype/branch/branch.txt rename {application_internal/doctype/report_filter_detail => hr/doctype/chapter_vi_a_detail}/__init__.py (100%) create mode 100644 hr/doctype/chapter_vi_a_detail/chapter_vi_a_detail.txt rename {application_internal/doctype/sms_center => hr/doctype/declaration_detail}/__init__.py (100%) create mode 100644 hr/doctype/declaration_detail/declaration_detail.txt rename {application_internal/doctype/sso_control => hr/doctype/deduction_detail}/__init__.py (100%) create mode 100644 hr/doctype/deduction_detail/deduction_detail.txt rename {application_internal/doctype/tips_common => hr/doctype/deduction_type}/__init__.py (100%) rename application_internal/doctype/transfer_account/__init__.py => hr/doctype/deduction_type/deduction_type.js (100%) create mode 100644 hr/doctype/deduction_type/deduction_type.txt rename {application_internal/doctype/transfer_control => hr/doctype/department}/__init__.py (100%) rename application_internal/doctype/transfer_module/__init__.py => hr/doctype/department/department.js (100%) create mode 100644 hr/doctype/department/department.txt rename {application_internal/doctype/wn_account_control => hr/doctype/designation}/__init__.py (100%) rename application_internal/doctype/wn_erp_client_control/__init__.py => hr/doctype/designation/designation.js (100%) create mode 100644 hr/doctype/designation/designation.txt rename {crm => hr/doctype/earn_deduction_detail}/__init__.py (100%) create mode 100644 hr/doctype/earn_deduction_detail/earn_deduction_detail.txt rename {crm/doctype => hr/doctype/earning_detail}/__init__.py (100%) create mode 100644 hr/doctype/earning_detail/earning_detail.txt rename {crm/doctype/campaign => hr/doctype/earning_type}/__init__.py (100%) rename crm/doctype/customer/__init__.py => hr/doctype/earning_type/earning_type.js (100%) create mode 100644 hr/doctype/earning_type/earning_type.txt rename {crm/doctype/enquiry => hr/doctype/educational_qualifications}/__init__.py (100%) create mode 100644 hr/doctype/educational_qualifications/educational_qualifications.txt rename {crm/doctype/enquiry_attachment_detail => hr/doctype/educational_qualifications_detail}/__init__.py (100%) create mode 100644 hr/doctype/educational_qualifications_detail/educational_qualifications_detail.txt rename {crm/doctype/enquiry_detail => hr/doctype/employee}/__init__.py (100%) rename {payroll => hr}/doctype/employee/employee.js (100%) rename {payroll => hr}/doctype/employee/employee.py (100%) create mode 100644 hr/doctype/employee/employee.txt rename {crm/doctype/enquiry_sms_detail => hr/doctype/employee_profile}/__init__.py (100%) rename {payroll => hr}/doctype/employee_profile/employee_profile.js (100%) rename {payroll => hr}/doctype/employee_profile/employee_profile.py (100%) rename {payroll => hr}/doctype/employee_profile/employee_profile.txt (100%) rename {crm/doctype/follow_up => hr/doctype/employment_type}/__init__.py (100%) rename crm/doctype/industry_type/__init__.py => hr/doctype/employment_type/employment_type.js (100%) create mode 100644 hr/doctype/employment_type/employment_type.txt rename {crm/doctype/installation_note => hr/doctype/expense_type}/__init__.py (100%) rename crm/doctype/installed_item_details/__init__.py => hr/doctype/expense_type/expense_type.js (100%) create mode 100644 hr/doctype/expense_type/expense_type.txt rename {crm/doctype/lead => hr/doctype/expense_voucher}/__init__.py (100%) rename {payroll => hr}/doctype/expense_voucher/expense_voucher.js (100%) rename {payroll => hr}/doctype/expense_voucher/expense_voucher.py (100%) create mode 100644 hr/doctype/expense_voucher/expense_voucher.txt rename {crm/doctype/lead_attachment_detail => hr/doctype/expense_voucher_detail}/__init__.py (100%) create mode 100644 hr/doctype/expense_voucher_detail/expense_voucher_detail.txt rename {crm/doctype/lead_item_detail => hr/doctype/experience_in_company_detail}/__init__.py (100%) create mode 100644 hr/doctype/experience_in_company_detail/experience_in_company_detail.txt rename {crm/doctype/lead_sms_detail => hr/doctype/grade}/__init__.py (100%) rename crm/doctype/plot_control/__init__.py => hr/doctype/grade/grade.js (100%) create mode 100644 hr/doctype/grade/grade.txt rename {crm/doctype/quotation => hr/doctype/holiday_list}/__init__.py (100%) rename crm/doctype/quotation_detail/__init__.py => hr/doctype/holiday_list/holiday_list.js (100%) rename {payroll => hr}/doctype/holiday_list/holiday_list.py (100%) create mode 100644 hr/doctype/holiday_list/holiday_list.txt rename {crm/doctype/return_detail => hr/doctype/holiday_list_detail}/__init__.py (100%) create mode 100644 hr/doctype/holiday_list_detail/holiday_list_detail.txt rename {crm/doctype/sales_common => hr/doctype/invest_80_declaration_detail}/__init__.py (100%) create mode 100644 hr/doctype/invest_80_declaration_detail/invest_80_declaration_detail.txt rename {crm/doctype/sales_order => hr/doctype/it_checklist}/__init__.py (100%) rename {payroll => hr}/doctype/it_checklist/it_checklist.js (100%) rename {payroll => hr}/doctype/it_checklist/it_checklist.py (100%) create mode 100644 hr/doctype/it_checklist/it_checklist.txt rename {crm/doctype/sales_order_detail => hr/doctype/kra_sheet}/__init__.py (100%) create mode 100644 hr/doctype/kra_sheet/kra_sheet.txt rename {crm/doctype/sales_team => hr/doctype/kra_template}/__init__.py (100%) rename crm/doctype/shipping_address/__init__.py => hr/doctype/kra_template/kra_template.js (100%) mode change 100755 => 100644 create mode 100644 hr/doctype/kra_template/kra_template.txt rename {crm/doctype/sms_center => hr/doctype/leave_allocation}/__init__.py (100%) mode change 100644 => 100755 rename {payroll => hr}/doctype/leave_allocation/leave_allocation.js (100%) rename {payroll => hr}/doctype/leave_allocation/leave_allocation.py (100%) create mode 100644 hr/doctype/leave_allocation/leave_allocation.txt rename {crm/page => hr/doctype/leave_application}/__init__.py (100%) mode change 100644 => 100755 rename {payroll => hr}/doctype/leave_application/leave_application.js (100%) rename {payroll => hr}/doctype/leave_application/leave_application.py (100%) create mode 100644 hr/doctype/leave_application/leave_application.txt rename {crm/page/customers => hr/doctype/leave_control_panel}/__init__.py (100%) rename {payroll => hr}/doctype/leave_control_panel/leave_control_panel.js (100%) rename {payroll => hr}/doctype/leave_control_panel/leave_control_panel.py (100%) create mode 100644 hr/doctype/leave_control_panel/leave_control_panel.txt rename {crm/page/sales_browser => hr/doctype/leave_type}/__init__.py (100%) rename crm/doctype/sms_center/sms_center.js => hr/doctype/leave_type/leave_type.js (100%) create mode 100644 hr/doctype/leave_type/leave_type.txt rename {crm/page/sales_dashboard => hr/doctype/other_income_detail}/__init__.py (100%) create mode 100644 hr/doctype/other_income_detail/other_income_detail.txt rename {crm/search_criteria => hr/doctype/payroll_rule}/__init__.py (100%) rename {payroll => hr}/doctype/payroll_rule/payroll_rule.js (100%) rename {payroll => hr}/doctype/payroll_rule/payroll_rule.py (100%) rename {payroll => hr}/doctype/payroll_rule/payroll_rule.txt (100%) rename {crm/search_criteria/delivered_items_to_be_install => hr/doctype/previous_experience_detail}/__init__.py (100%) create mode 100644 hr/doctype/previous_experience_detail/previous_experience_detail.txt rename {crm/search_criteria/delivery_note_itemwise_pending_to_bill => hr/doctype/professional_training_details}/__init__.py (100%) create mode 100644 hr/doctype/professional_training_details/professional_training_details.txt rename {crm/search_criteria/draft_sales_orders => hr/doctype/salary_slip}/__init__.py (100%) rename {payroll => hr}/doctype/salary_slip/salary_slip.js (100%) rename {payroll => hr}/doctype/salary_slip/salary_slip.py (100%) create mode 100644 hr/doctype/salary_slip/salary_slip.txt rename {crm/search_criteria/follow_up_report => hr/doctype/salary_slip_control_panel}/__init__.py (100%) rename {payroll => hr}/doctype/salary_slip_control_panel/salary_slip_control_panel.js (100%) rename {payroll => hr}/doctype/salary_slip_control_panel/salary_slip_control_panel.py (100%) create mode 100644 hr/doctype/salary_slip_control_panel/salary_slip_control_panel.txt rename {crm/search_criteria/gross_profit => hr/doctype/salary_structure}/__init__.py (100%) rename {payroll => hr}/doctype/salary_structure/salary_structure.js (100%) rename {payroll => hr}/doctype/salary_structure/salary_structure.py (100%) create mode 100644 hr/doctype/salary_structure/salary_structure.txt rename {crm/search_criteria/itemwise_delivery_details => hr/doctype/ss_deduction_detail}/__init__.py (100%) create mode 100644 hr/doctype/ss_deduction_detail/ss_deduction_detail.txt rename {crm/search_criteria/itemwise_sales_details => hr/doctype/ss_earning_detail}/__init__.py (100%) create mode 100644 hr/doctype/ss_earning_detail/ss_earning_detail.txt rename {crm/search_criteria/monthly_despatched_trend => hr/page}/__init__.py (100%) rename {crm/search_criteria/periodic_sales_summary => hr/search_criteria}/__init__.py (100%) rename {crm/search_criteria/sales_agentwise_commission => hr/search_criteria/employee_appraisals}/__init__.py (100%) rename {payroll => hr}/search_criteria/employee_appraisals/employee_appraisals.txt (100%) rename {crm/search_criteria/sales_order_pending_items1 => hr/search_criteria/employee_details}/__init__.py (100%) rename {payroll => hr}/search_criteria/employee_details/employee_details.txt (100%) rename {crm/search_criteria/sales_orderwise_booking_&_delivery_summary => hr/search_criteria/employee_in_company_experience}/__init__.py (100%) rename {payroll => hr}/search_criteria/employee_in_company_experience/employee_in_company_experience.txt (100%) rename {crm/search_criteria/sales_orderwise_pending_amount_to_bill => hr/search_criteria/employee_information}/__init__.py (100%) rename {payroll => hr}/search_criteria/employee_information/employee_information.py (100%) rename {payroll => hr}/search_criteria/employee_information/employee_information.txt (100%) rename {crm/search_criteria/sales_orderwise_pending_qty_to_deliver => hr/search_criteria/employees_birthday}/__init__.py (100%) rename {payroll => hr}/search_criteria/employees_birthday/employees_birthday.txt (100%) rename {crm/search_criteria/sales_persons_target_variance_item_group_wise => hr/search_criteria/employeewise_balance_leave_report}/__init__.py (100%) rename {payroll => hr}/search_criteria/employeewise_balance_leave_report/employeewise_balance_leave_report.js (100%) rename {payroll => hr}/search_criteria/employeewise_balance_leave_report/employeewise_balance_leave_report.py (100%) rename {payroll => hr}/search_criteria/employeewise_balance_leave_report/employeewise_balance_leave_report.txt (100%) rename {crm/search_criteria/sales_personwise_transaction_summary => hr/search_criteria/employeewise_leave_transaction_details}/__init__.py (100%) mode change 100755 => 100644 rename {payroll => hr}/search_criteria/employeewise_leave_transaction_details/employeewise_leave_transaction_details.txt (100%) rename {crm/search_criteria/so_pending_items_3 => hr/search_criteria/expense_vouchers}/__init__.py (100%) rename {payroll => hr}/search_criteria/expense_vouchers/expense_vouchers.txt (100%) rename {crm/search_criteria/target_variance_report => hr/search_criteria/monthly_attendance_details}/__init__.py (100%) rename {payroll => hr}/search_criteria/monthly_attendance_details/monthly_attendance_details.js (100%) rename {payroll => hr}/search_criteria/monthly_attendance_details/monthly_attendance_details.py (100%) rename {payroll => hr}/search_criteria/monthly_attendance_details/monthly_attendance_details.sql (100%) rename {payroll => hr}/search_criteria/monthly_attendance_details/monthly_attendance_details.txt (100%) rename {crm/search_criteria/territories_target_variance_item_group_wise => hr/search_criteria/monthly_salary_register}/__init__.py (100%) rename {payroll => hr}/search_criteria/monthly_salary_register/monthly_salary_register.txt (100%) rename {crm/search_criteria/territory_item_group_wise_gp => hr/search_criteria/new_or_left_employees_for_a_month}/__init__.py (100%) rename {payroll => hr}/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.js (100%) rename {payroll => hr}/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.py (100%) rename {payroll => hr}/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.txt (100%) rename {crm/search_criteria/territory_sales___variance_report => hr/search_criteria/pending_appraisals}/__init__.py (100%) rename {payroll => hr}/search_criteria/pending_appraisals/pending_appraisals.js (100%) rename {payroll => hr}/search_criteria/pending_appraisals/pending_appraisals.txt (100%) rename {crm/search_criteria/total_target_variance_report => hr/search_criteria/pending_expense_vouchers}/__init__.py (100%) rename {payroll => hr}/search_criteria/pending_expense_vouchers/pending_expense_vouchers.js (100%) rename {payroll => hr}/search_criteria/pending_expense_vouchers/pending_expense_vouchers.txt (100%) rename {crm/search_criteria/variance_report => hr/search_criteria/salary_register}/__init__.py (100%) rename {payroll => hr}/search_criteria/salary_register/salary_register.js (100%) rename {payroll => hr}/search_criteria/salary_register/salary_register.py (100%) rename {payroll => hr}/search_criteria/salary_register/salary_register.txt (100%) rename {maintenance => hr/search_criteria/salary_slips}/__init__.py (100%) rename {payroll => hr}/search_criteria/salary_slips/salary_slips.txt (100%) rename {maintenance/doctype => hr/search_criteria/salary_structure_details}/__init__.py (100%) rename {payroll => hr}/search_criteria/salary_structure_details/salary_structure_details.txt (100%) delete mode 100644 maintenance/Module Def/Maintenance/Maintenance.txt delete mode 100644 maintenance/doctype/customer_issue/customer_issue.txt delete mode 100644 maintenance/doctype/item_maintenance_detail/item_maintenance_detail.txt delete mode 100644 maintenance/doctype/maintenance_schedule/maintenance_schedule.txt delete mode 100644 maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt delete mode 100644 maintenance/doctype/maintenance_visit/maintenance_visit.txt delete mode 100644 maintenance/doctype/maintenance_visit_detail/maintenance_visit_detail.txt delete mode 100644 maintenance/doctype/support_ticket/support_ticket.txt delete mode 100644 maintenance/doctype/support_ticket_response/support_ticket_response.txt delete mode 100644 maintenance/search_criteria/customer_issues1/customer_issues1.txt delete mode 100644 maintenance/search_criteria/warranty_amc_summary1/warranty_amc_summary1.txt delete mode 100644 mapper/DocType Mapper/Enquiry-Service Quotation/Enquiry-Service Quotation.txt delete mode 100644 mapper/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt delete mode 100644 mapper/DocType Mapper/Sales Order-Maintenance Report/Sales Order-Maintenance Report.txt delete mode 100644 mapper/Module Def/Mapper/Mapper.txt delete mode 100644 material_management/doctype/batch/batch.txt delete mode 100644 material_management/doctype/bin/bin.txt delete mode 100644 material_management/doctype/delivery_note/delivery_note.txt delete mode 100644 material_management/doctype/delivery_note_detail/delivery_note_detail.txt delete mode 100644 material_management/doctype/delivery_note_packing_detail/delivery_note_packing_detail.txt delete mode 100644 material_management/doctype/item/item.txt delete mode 100644 material_management/doctype/item_attachments_detail/item_attachments_detail.txt delete mode 100644 material_management/doctype/item_specification_detail/item_specification_detail.txt delete mode 100644 material_management/doctype/item_tax/item_tax.txt delete mode 100644 material_management/doctype/landed_cost_master/landed_cost_master.txt delete mode 100644 material_management/doctype/landed_cost_master_detail/landed_cost_master_detail.txt delete mode 100644 material_management/doctype/landed_cost_wizard/landed_cost_wizard.txt delete mode 100644 material_management/doctype/purchase_receipt/purchase_receipt.txt delete mode 100644 material_management/doctype/purchase_receipt_detail/purchase_receipt_detail.txt delete mode 100644 material_management/doctype/ref_rate_detail/ref_rate_detail.txt delete mode 100644 material_management/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.txt delete mode 100644 material_management/doctype/sales_bom/sales_bom.txt delete mode 100644 material_management/doctype/sales_bom_detail/sales_bom_detail.txt delete mode 100644 material_management/doctype/serial_no/serial_no.txt delete mode 100644 material_management/doctype/stock_entry/stock_entry.txt delete mode 100644 material_management/doctype/stock_entry_detail/stock_entry_detail.txt delete mode 100644 material_management/doctype/stock_ledger/stock_ledger.txt delete mode 100644 material_management/doctype/stock_ledger_entry/stock_ledger_entry.txt delete mode 100644 material_management/doctype/stock_reconciliation/stock_reconciliation.txt delete mode 100644 material_management/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt delete mode 100644 material_management/doctype/uom_conversion_detail/uom_conversion_detail.txt delete mode 100644 material_management/doctype/valuation_control/valuation_control.txt delete mode 100644 material_management/doctype/warehouse/warehouse.txt delete mode 100644 observers.py create mode 100644 patches/erpnext_structure_cleanup.py rename patches/{ => old_patches}/customer_address.py (100%) rename patches/{ => old_patches}/doctype_permission_patch.py (100%) rename patches/{ => old_patches}/feed_patch.py (100%) rename replacecode.py => patches/old_patches/replacecode.py (100%) delete mode 100644 payroll/Module Def/Payroll/Payroll.js delete mode 100644 payroll/doctype/absent_days_detail/absent_days_detail.txt delete mode 100644 payroll/doctype/action_detail/action_detail.txt delete mode 100644 payroll/doctype/appraisal/appraisal.txt delete mode 100644 payroll/doctype/appraisal_detail/appraisal_detail.txt delete mode 100644 payroll/doctype/attendance/attendance.txt delete mode 100644 payroll/doctype/attendance_control_panel/attendance_control_panel.txt delete mode 100644 payroll/doctype/branch/branch.js delete mode 100644 payroll/doctype/branch/branch.txt delete mode 100644 payroll/doctype/chapter_vi_a_detail/chapter_vi_a_detail.txt delete mode 100644 payroll/doctype/city/city.js delete mode 100644 payroll/doctype/city/city.txt delete mode 100644 payroll/doctype/condition_detail/condition_detail.txt delete mode 100644 payroll/doctype/declaration_detail/declaration_detail.txt delete mode 100644 payroll/doctype/deduction_detail/deduction_detail.txt delete mode 100644 payroll/doctype/deduction_type/deduction_type.js delete mode 100644 payroll/doctype/deduction_type/deduction_type.txt delete mode 100644 payroll/doctype/department/department.js delete mode 100644 payroll/doctype/department/department.txt delete mode 100644 payroll/doctype/designation/designation.js delete mode 100644 payroll/doctype/designation/designation.txt delete mode 100644 payroll/doctype/earn_deduction_detail/earn_deduction_detail.txt delete mode 100644 payroll/doctype/earning_detail/earning_detail.txt delete mode 100644 payroll/doctype/earning_type/earning_type.js delete mode 100644 payroll/doctype/earning_type/earning_type.txt delete mode 100644 payroll/doctype/educational_qualifications/educational_qualifications.txt delete mode 100644 payroll/doctype/educational_qualifications_detail/educational_qualifications_detail.txt delete mode 100644 payroll/doctype/employee/employee.txt delete mode 100644 payroll/doctype/employment_type/employment_type.js delete mode 100644 payroll/doctype/employment_type/employment_type.txt delete mode 100644 payroll/doctype/expense_type/expense_type.js delete mode 100644 payroll/doctype/expense_type/expense_type.txt delete mode 100644 payroll/doctype/expense_voucher/expense_voucher.txt delete mode 100644 payroll/doctype/expense_voucher_detail/expense_voucher_detail.txt delete mode 100644 payroll/doctype/experience_in_company_detail/experience_in_company_detail.txt delete mode 100644 payroll/doctype/grade/grade.js delete mode 100644 payroll/doctype/grade/grade.txt delete mode 100644 payroll/doctype/holiday_list/holiday_list.js delete mode 100644 payroll/doctype/holiday_list/holiday_list.txt delete mode 100644 payroll/doctype/holiday_list_detail/holiday_list_detail.txt delete mode 100644 payroll/doctype/invest_80_declaration_detail/invest_80_declaration_detail.txt delete mode 100644 payroll/doctype/it_checklist/it_checklist.txt delete mode 100644 payroll/doctype/kra_sheet/kra_sheet.txt delete mode 100644 payroll/doctype/kra_template/kra_template.js delete mode 100644 payroll/doctype/kra_template/kra_template.txt delete mode 100644 payroll/doctype/leave_allocation/leave_allocation.txt delete mode 100644 payroll/doctype/leave_applicable_detail/leave_applicable_detail.txt delete mode 100644 payroll/doctype/leave_application/leave_application.txt delete mode 100644 payroll/doctype/leave_control_panel/leave_control_panel.txt delete mode 100644 payroll/doctype/leave_detail/leave_detail.txt delete mode 100644 payroll/doctype/leave_type/leave_type.js delete mode 100644 payroll/doctype/leave_type/leave_type.txt delete mode 100644 payroll/doctype/leave_type_detail/leave_type_detail.txt delete mode 100644 payroll/doctype/other_income_detail/other_income_detail.txt delete mode 100644 payroll/doctype/previous_experience_detail/previous_experience_detail.txt delete mode 100644 payroll/doctype/professional_training_details/professional_training_details.txt delete mode 100644 payroll/doctype/rule_engine/rule_engine.txt delete mode 100644 payroll/doctype/salary_slip/salary_slip.txt delete mode 100644 payroll/doctype/salary_slip_control_panel/salary_slip_control_panel.txt delete mode 100644 payroll/doctype/salary_structure/salary_structure.txt delete mode 100644 payroll/doctype/ss_deduction_detail/ss_deduction_detail.txt delete mode 100644 payroll/doctype/ss_earning_detail/ss_earning_detail.txt delete mode 100644 payroll/search_criteria/appraisal_custom/appraisal_custom.txt delete mode 100644 payroll/search_criteria/datewise_leave_report/datewise_leave_report.txt delete mode 100644 payroll/search_criteria/datewise_leave_report1/datewise_leave_report1.js delete mode 100644 payroll/search_criteria/datewise_leave_report1/datewise_leave_report1.py delete mode 100644 payroll/search_criteria/datewise_leave_report1/datewise_leave_report1.txt delete mode 100644 payroll/search_criteria/datewise_leave_report2/datewise_leave_report2.js delete mode 100644 payroll/search_criteria/datewise_leave_report2/datewise_leave_report2.py delete mode 100644 payroll/search_criteria/datewise_leave_report2/datewise_leave_report2.txt delete mode 100644 payroll/search_criteria/employee_details1/employee_details1.js delete mode 100644 payroll/search_criteria/employee_details1/employee_details1.py delete mode 100644 payroll/search_criteria/employee_details1/employee_details1.txt delete mode 100644 payroll/search_criteria/employee_details2/employee_details2.js delete mode 100644 payroll/search_criteria/employee_details2/employee_details2.py delete mode 100644 payroll/search_criteria/employee_details2/employee_details2.txt delete mode 100644 payroll/search_criteria/employee_in_company_experience1/employee_in_company_experience1.txt delete mode 100644 payroll/search_criteria/employee_in_company_experience2/employee_in_company_experience2.txt delete mode 100644 payroll/search_criteria/employees_birthday1/employees_birthday1.js delete mode 100644 payroll/search_criteria/employees_birthday1/employees_birthday1.py delete mode 100644 payroll/search_criteria/employees_birthday1/employees_birthday1.txt delete mode 100644 payroll/search_criteria/installed_items/installed_items.js delete mode 100644 payroll/search_criteria/installed_items/installed_items.txt delete mode 100644 payroll/search_criteria/monthly_salary_register1/monthly_salary_register1.js delete mode 100644 payroll/search_criteria/monthly_salary_register1/monthly_salary_register1.py delete mode 100644 payroll/search_criteria/monthly_salary_register1/monthly_salary_register1.txt delete mode 100644 payroll/search_criteria/monthly_salary_register2/monthly_salary_register2.js delete mode 100644 payroll/search_criteria/monthly_salary_register2/monthly_salary_register2.py delete mode 100644 payroll/search_criteria/monthly_salary_register2/monthly_salary_register2.txt delete mode 100644 payroll/search_criteria/salary_slips1/salary_slips1.txt delete mode 100644 payroll/search_criteria/salary_structure_details3/salary_structure_details3.txt delete mode 100644 payroll/search_criteria/salary_structure_details4/salary_structure_details4.txt rename {mapper => production}/DocType Mapper/Production Forecast-Production Plan/Production Forecast-Production Plan.txt (100%) rename {mapper => production}/DocType Mapper/Production Forecast-Production Planning Tool/Production Forecast-Production Planning Tool.txt (100%) rename {mapper => production}/DocType Mapper/Sales Order-Production Plan/Sales Order-Production Plan.txt (100%) rename {roles => production}/Role/Production Manager/Production Manager.txt (100%) rename {roles => production}/Role/Production User/Production User.txt (100%) rename {roles => projects}/Role/Projects User/Projects User.txt (100%) delete mode 100644 projects/search_criteria/projectwise_delivered_qty_and_costs1/projectwise_delivered_qty_and_costs1.js delete mode 100644 projects/search_criteria/projectwise_delivered_qty_and_costs1/projectwise_delivered_qty_and_costs1.txt delete mode 100644 projects/search_criteria/projectwise_delivered_qty_and_costs2/projectwise_delivered_qty_and_costs2.txt delete mode 100644 projects/search_criteria/projectwise_pending_qty_and_costs1/projectwise_pending_qty_and_costs1.js delete mode 100644 projects/search_criteria/projectwise_pending_qty_and_costs1/projectwise_pending_qty_and_costs1.txt delete mode 100644 projects/search_criteria/projectwise_pending_qty_and_costs2/projectwise_pending_qty_and_costs2.js delete mode 100644 projects/search_criteria/projectwise_pending_qty_and_costs2/projectwise_pending_qty_and_costs2.txt delete mode 100644 roles/Module Def/Roles/Roles.txt delete mode 100644 roles/Role/Administrator/Administrator.txt delete mode 100644 roles/Role/All/All.txt delete mode 100644 roles/Role/Guest/Guest.txt delete mode 100644 roles/doctype/role/role.txt rename {mapper => selling}/DocType Mapper/Delivery Note-Installation Note/Delivery Note-Installation Note.txt (100%) rename {mapper => selling}/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt (100%) rename {mapper => selling}/DocType Mapper/Lead-Customer/Lead-Customer.txt (100%) rename {mapper => selling}/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt (100%) rename {mapper => selling}/DocType Mapper/Project-Sales Order/Project-Sales Order.txt (100%) rename {mapper => selling}/DocType Mapper/Quotation-Sales Order/Quotation-Sales Order.txt (100%) rename crm/Module Def/CRM/CRM.txt => selling/Module Def/Selling/Selling.txt (72%) rename {roles => selling}/Role/Customer/Customer.txt (100%) rename {roles => selling}/Role/Partner/Partner.txt (100%) rename {roles => selling}/Role/Sales Manager/Sales Manager.txt (100%) rename {roles => selling}/Role/Sales Master Manager/Sales Master Manager.txt (100%) rename {roles => selling}/Role/Sales User/Sales User.txt (100%) rename {maintenance/doctype/customer_issue => selling}/__init__.py (100%) rename {maintenance/doctype/item_maintenance_detail => selling/doctype}/__init__.py (100%) rename {maintenance/doctype/maintenance_schedule => selling/doctype/campaign}/__init__.py (100%) rename {crm => selling}/doctype/campaign/campaign.js (100%) create mode 100644 selling/doctype/campaign/campaign.txt rename {maintenance/doctype/maintenance_schedule_detail => selling/doctype/customer}/__init__.py (100%) rename {crm => selling}/doctype/customer/customer.js (100%) rename {crm => selling}/doctype/customer/customer.py (100%) create mode 100644 selling/doctype/customer/customer.txt rename {maintenance/doctype/maintenance_visit => selling/doctype/enquiry}/__init__.py (100%) rename {crm => selling}/doctype/enquiry/enquiry.js (100%) rename {crm => selling}/doctype/enquiry/enquiry.py (100%) create mode 100644 selling/doctype/enquiry/enquiry.txt rename {maintenance/doctype/maintenance_visit_detail => selling/doctype/enquiry_detail}/__init__.py (100%) create mode 100644 selling/doctype/enquiry_detail/enquiry_detail.txt rename {maintenance/doctype/support_ticket_response => selling/doctype/enquiry_sms_detail}/__init__.py (100%) rename {crm => selling}/doctype/enquiry_sms_detail/enquiry_sms_detail.txt (100%) rename {maintenance/search_criteria => selling/doctype/follow_up}/__init__.py (100%) create mode 100644 selling/doctype/follow_up/follow_up.txt rename {maintenance/search_criteria/amc_summary => selling/doctype/industry_type}/__init__.py (100%) rename {crm => selling}/doctype/industry_type/industry_type.js (100%) create mode 100644 selling/doctype/industry_type/industry_type.txt rename {maintenance/search_criteria/customer_issues => selling/doctype/installation_note}/__init__.py (100%) rename {crm => selling}/doctype/installation_note/installation_note.js (100%) rename {crm => selling}/doctype/installation_note/installation_note.py (99%) create mode 100644 selling/doctype/installation_note/installation_note.txt rename {maintenance/search_criteria/customer_issues1 => selling/doctype/installed_item_details}/__init__.py (100%) create mode 100644 selling/doctype/installed_item_details/installed_item_details.txt rename {maintenance/search_criteria/maintenance_orderwise_pending_amount_to_bill => selling/doctype/lead}/__init__.py (100%) rename {crm => selling}/doctype/lead/lead.js (100%) rename {crm => selling}/doctype/lead/lead.py (100%) create mode 100644 selling/doctype/lead/lead.txt rename {maintenance/search_criteria/maintenance_schedule_details => selling/doctype/lead_attachment_detail}/__init__.py (100%) rename {crm => selling}/doctype/lead_attachment_detail/lead_attachment_detail.txt (100%) rename {maintenance/search_criteria/warranty_amc_expiry_details => selling/doctype/lead_item_detail}/__init__.py (100%) rename {crm => selling}/doctype/lead_item_detail/lead_item_detail.txt (100%) rename {maintenance/search_criteria/warranty_amc_summary => selling/doctype/lead_sms_detail}/__init__.py (100%) rename {crm => selling}/doctype/lead_sms_detail/lead_sms_detail.txt (100%) rename {maintenance/search_criteria/warranty_amc_summary1 => selling/doctype/plot_control}/__init__.py (100%) rename {crm => selling}/doctype/plot_control/plot_control.py (100%) create mode 100644 selling/doctype/plot_control/plot_control.txt rename {mapper => selling/doctype/quotation}/__init__.py (100%) rename {crm => selling}/doctype/quotation/quotation.js (100%) rename {crm => selling}/doctype/quotation/quotation.py (100%) create mode 100644 selling/doctype/quotation/quotation.txt rename {material_management => selling/doctype/quotation_detail}/__init__.py (100%) create mode 100644 selling/doctype/quotation_detail/quotation_detail.txt rename {material_management/doctype => selling/doctype/return_detail}/__init__.py (100%) create mode 100644 selling/doctype/return_detail/return_detail.txt rename {material_management/doctype/batch => selling/doctype/sales_common}/__init__.py (100%) rename {crm => selling}/doctype/sales_common/sales_common.js (100%) rename {crm => selling}/doctype/sales_common/sales_common.py (100%) create mode 100644 selling/doctype/sales_common/sales_common.txt rename {material_management/doctype/bin => selling/doctype/sales_order}/__init__.py (100%) rename {crm => selling}/doctype/sales_order/sales_order.js (100%) rename {crm => selling}/doctype/sales_order/sales_order.py (100%) create mode 100644 selling/doctype/sales_order/sales_order.txt rename {material_management/doctype/delivery_note => selling/doctype/sales_order_detail}/__init__.py (100%) create mode 100644 selling/doctype/sales_order_detail/sales_order_detail.txt rename {material_management/doctype/delivery_note_detail => selling/doctype/sales_team}/__init__.py (100%) create mode 100644 selling/doctype/sales_team/sales_team.txt rename {material_management/doctype/delivery_note_packing_detail => selling/doctype/shipping_address}/__init__.py (100%) mode change 100644 => 100755 rename {crm => selling}/doctype/shipping_address/shipping_address.js (100%) rename {crm => selling}/doctype/shipping_address/shipping_address.py (100%) create mode 100755 selling/doctype/shipping_address/shipping_address.txt rename {material_management/doctype/item => selling/doctype/sms_center}/__init__.py (100%) rename material_management/doctype/item_attachments_detail/__init__.py => selling/doctype/sms_center/sms_center.js (100%) rename {crm => selling}/doctype/sms_center/sms_center.py (100%) create mode 100644 selling/doctype/sms_center/sms_center.txt rename {material_management/doctype/item_specification_detail => selling/page}/__init__.py (100%) rename {material_management/doctype/item_tax => selling/page/customers}/__init__.py (100%) rename {crm => selling}/page/customers/customers.html (100%) rename {crm => selling}/page/customers/customers.js (100%) rename {crm => selling}/page/customers/customers.txt (100%) rename {material_management/doctype/landed_cost_master => selling/page/sales_browser}/__init__.py (100%) rename {crm => selling}/page/sales_browser/sales_browser.html (100%) rename {crm => selling}/page/sales_browser/sales_browser.js (100%) create mode 100644 selling/page/sales_browser/sales_browser.txt rename {material_management/doctype/landed_cost_master_detail => selling/page/sales_dashboard}/__init__.py (100%) rename {crm => selling}/page/sales_dashboard/sales_dashboard.html (100%) rename {crm => selling}/page/sales_dashboard/sales_dashboard.js (100%) create mode 100644 selling/page/sales_dashboard/sales_dashboard.txt rename {material_management/doctype/landed_cost_wizard => selling/search_criteria}/__init__.py (100%) rename {material_management/doctype/purchase_receipt => selling/search_criteria/delivered_items_to_be_install}/__init__.py (100%) rename {crm => selling}/search_criteria/delivered_items_to_be_install/delivered_items_to_be_install.js (100%) rename {crm => selling}/search_criteria/delivered_items_to_be_install/delivered_items_to_be_install.txt (100%) rename {material_management/doctype/purchase_receipt_detail => selling/search_criteria/delivery_note_itemwise_pending_to_bill}/__init__.py (100%) rename {crm => selling}/search_criteria/delivery_note_itemwise_pending_to_bill/delivery_note_itemwise_pending_to_bill.txt (100%) rename {material_management/doctype/ref_rate_detail => selling/search_criteria/draft_sales_orders}/__init__.py (100%) rename {crm => selling}/search_criteria/draft_sales_orders/draft_sales_orders.js (100%) rename {crm => selling}/search_criteria/draft_sales_orders/draft_sales_orders.txt (100%) rename {material_management/doctype/sales_and_purchase_return_wizard => selling/search_criteria/follow_up_report}/__init__.py (100%) rename {crm => selling}/search_criteria/follow_up_report/follow_up_report.js (100%) rename {crm => selling}/search_criteria/follow_up_report/follow_up_report.py (100%) rename {crm => selling}/search_criteria/follow_up_report/follow_up_report.txt (100%) rename {material_management/doctype/sales_bom => selling/search_criteria/gross_profit}/__init__.py (100%) rename {crm => selling}/search_criteria/gross_profit/gross_profit.js (100%) rename {crm => selling}/search_criteria/gross_profit/gross_profit.py (100%) rename {crm => selling}/search_criteria/gross_profit/gross_profit.txt (100%) rename {material_management/doctype/sales_bom_detail => selling/search_criteria/itemwise_delivery_details}/__init__.py (100%) rename {crm => selling}/search_criteria/itemwise_delivery_details/itemwise_delivery_details.js (100%) rename {crm => selling}/search_criteria/itemwise_delivery_details/itemwise_delivery_details.py (100%) rename {crm => selling}/search_criteria/itemwise_delivery_details/itemwise_delivery_details.txt (100%) rename {material_management/doctype/serial_no => selling/search_criteria/itemwise_sales_details}/__init__.py (100%) rename {crm => selling}/search_criteria/itemwise_sales_details/itemwise_sales_details.js (100%) rename {crm => selling}/search_criteria/itemwise_sales_details/itemwise_sales_details.py (100%) rename {crm => selling}/search_criteria/itemwise_sales_details/itemwise_sales_details.txt (100%) rename {material_management/doctype/stock_entry => selling/search_criteria/monthly_despatched_trend}/__init__.py (100%) rename {crm => selling}/search_criteria/monthly_despatched_trend/monthly_despatched_trend.js (100%) rename {crm => selling}/search_criteria/monthly_despatched_trend/monthly_despatched_trend.py (100%) rename {crm => selling}/search_criteria/monthly_despatched_trend/monthly_despatched_trend.txt (100%) rename {material_management/doctype/stock_entry_detail => selling/search_criteria/periodic_sales_summary}/__init__.py (100%) rename {crm => selling}/search_criteria/periodic_sales_summary/periodic_sales_summary.js (100%) rename {crm => selling}/search_criteria/periodic_sales_summary/periodic_sales_summary.txt (100%) rename {material_management/doctype/stock_ledger => selling/search_criteria/sales_agentwise_commission}/__init__.py (100%) rename {crm => selling}/search_criteria/sales_agentwise_commission/sales_agentwise_commission.js (100%) rename {crm => selling}/search_criteria/sales_agentwise_commission/sales_agentwise_commission.py (100%) rename {crm => selling}/search_criteria/sales_agentwise_commission/sales_agentwise_commission.txt (100%) rename {material_management/doctype/stock_ledger_entry => selling/search_criteria/sales_order_pending_items1}/__init__.py (100%) rename {crm => selling}/search_criteria/sales_order_pending_items1/sales_order_pending_items1.js (100%) rename {crm => selling}/search_criteria/sales_order_pending_items1/sales_order_pending_items1.txt (100%) rename {crm => selling}/search_criteria/sales_orderwise_booking_ (100%) rename {material_management/doctype/stock_reconciliation => selling/search_criteria/sales_orderwise_booking_&_delivery_summary}/__init__.py (100%) rename {crm => selling}/search_criteria/sales_orderwise_booking_&_delivery_summary/sales_orderwise_booking_&_delivery_summary.txt (100%) rename {material_management/doctype/stock_uom_replace_utility => selling/search_criteria/sales_orderwise_pending_amount_to_bill}/__init__.py (100%) rename {crm => selling}/search_criteria/sales_orderwise_pending_amount_to_bill/sales_orderwise_pending_amount_to_bill.js (100%) rename {crm => selling}/search_criteria/sales_orderwise_pending_amount_to_bill/sales_orderwise_pending_amount_to_bill.txt (100%) rename {material_management/doctype/uom_conversion_detail => selling/search_criteria/sales_orderwise_pending_qty_to_deliver}/__init__.py (100%) rename {crm => selling}/search_criteria/sales_orderwise_pending_qty_to_deliver/sales_orderwise_pending_qty_to_deliver.txt (100%) rename {material_management/doctype/valuation_control => selling/search_criteria/sales_persons_target_variance_item_group_wise}/__init__.py (100%) rename {crm => selling}/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.js (100%) rename {crm => selling}/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.py (100%) rename {crm => selling}/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.txt (100%) rename {material_management/doctype/warehouse => selling/search_criteria/sales_personwise_transaction_summary}/__init__.py (100%) mode change 100644 => 100755 rename {crm => selling}/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.js (100%) rename {crm => selling}/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.py (100%) rename {crm => selling}/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.txt (100%) rename {material_management/page => selling/search_criteria/target_variance_report}/__init__.py (100%) rename {crm => selling}/search_criteria/target_variance_report/target_variance_report.js (100%) rename {crm => selling}/search_criteria/target_variance_report/target_variance_report.py (100%) rename {crm => selling}/search_criteria/target_variance_report/target_variance_report.txt (100%) rename {material_management/search_criteria => selling/search_criteria/territories_target_variance_item_group_wise}/__init__.py (100%) rename {crm => selling}/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.js (100%) rename {crm => selling}/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.py (100%) rename {crm => selling}/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.txt (100%) rename {material_management/search_criteria/itemwise_price_list => selling/search_criteria/territory_item_group_wise_gp}/__init__.py (100%) rename {crm => selling}/search_criteria/territory_item_group_wise_gp/territory_item_group_wise_gp.py (100%) rename {crm => selling}/search_criteria/territory_item_group_wise_gp/territory_item_group_wise_gp.txt (100%) rename {material_management/search_criteria/shortage_to_indent => selling/search_criteria/territory_sales___variance_report}/__init__.py (100%) rename {crm => selling}/search_criteria/territory_sales___variance_report/territory_sales___variance_report.js (100%) rename {crm => selling}/search_criteria/territory_sales___variance_report/territory_sales___variance_report.py (100%) rename {crm => selling}/search_criteria/territory_sales___variance_report/territory_sales___variance_report.txt (100%) rename {material_management/search_criteria/stock_aging_report => selling/search_criteria/total_target_variance_report}/__init__.py (100%) rename {crm => selling}/search_criteria/total_target_variance_report/total_target_variance_report.js (100%) rename {crm => selling}/search_criteria/total_target_variance_report/total_target_variance_report.py (100%) rename {crm => selling}/search_criteria/total_target_variance_report/total_target_variance_report.sql (100%) rename {crm => selling}/search_criteria/total_target_variance_report/total_target_variance_report.txt (100%) rename {material_management/search_criteria/stock_ledger => selling/search_criteria/variance_report}/__init__.py (100%) rename {crm => selling}/search_criteria/variance_report/variance_report.js (100%) rename {crm => selling}/search_criteria/variance_report/variance_report.py (100%) rename {crm => selling}/search_criteria/variance_report/variance_report.sql (100%) rename {crm => selling}/search_criteria/variance_report/variance_report.txt (100%) delete mode 100644 settings/Module Def/Settings/Settings.txt delete mode 100644 settings/doctype/authorization_control/authorization_control.txt delete mode 100644 settings/doctype/authorization_rule/authorization_rule.txt delete mode 100644 settings/doctype/email_settings/email_settings.txt delete mode 100644 settings/doctype/naming_series/__init__.py delete mode 100644 settings/doctype/naming_series/naming_series.txt delete mode 100644 settings/doctype/notification_control/__init__.py delete mode 100644 settings/doctype/notification_control/notification_control.txt delete mode 100644 settings/doctype/permission_control/__init__.py delete mode 100644 settings/doctype/permission_control/permission_control.txt delete mode 100644 settings/doctype/print_heading/__init__.py delete mode 100644 settings/doctype/print_heading/print_heading.txt delete mode 100644 settings/doctype/series_detail/__init__.py delete mode 100644 settings/doctype/series_detail/series_detail.txt delete mode 100644 settings/doctype/setup_wizard_control/__init__.py delete mode 100644 settings/doctype/setup_wizard_control/setup_wizard_control.txt delete mode 100755 settings/doctype/sms_settings/__init__.py delete mode 100755 settings/doctype/sms_settings/sms_settings.txt delete mode 100755 settings/doctype/static_parameter_detail/__init__.py delete mode 100755 settings/doctype/static_parameter_detail/static_parameter_detail.txt delete mode 100644 settings/doctype/update_series/__init__.py delete mode 100644 settings/doctype/update_series/update_series.txt delete mode 100644 settings/doctype/workflow_action_detail/__init__.py delete mode 100644 settings/doctype/workflow_action_detail/workflow_action_detail.txt delete mode 100644 settings/doctype/workflow_engine/__init__.py delete mode 100644 settings/doctype/workflow_engine/workflow_engine.txt delete mode 100644 settings/doctype/workflow_rule/__init__.py delete mode 100644 settings/doctype/workflow_rule/workflow_rule.txt delete mode 100644 settings/doctype/workflow_rule_detail/__init__.py delete mode 100644 settings/doctype/workflow_rule_detail/workflow_rule_detail.txt rename {roles => setup}/Role/System Manager/System Manager.txt (100%) rename {material_management/search_criteria/stock_level => setup/doctype/authorization_control}/__init__.py (100%) rename {settings => setup}/doctype/authorization_control/authorization_control.js (100%) rename {settings => setup}/doctype/authorization_control/authorization_control.py (100%) create mode 100644 setup/doctype/authorization_control/authorization_control.txt rename {material_management/search_criteria/stock_report => setup/doctype/authorization_rule}/__init__.py (100%) rename {settings => setup}/doctype/authorization_rule/authorization_rule.js (100%) rename {settings => setup}/doctype/authorization_rule/authorization_rule.py (100%) create mode 100644 setup/doctype/authorization_rule/authorization_rule.txt rename {payroll => setup/doctype/email_settings}/__init__.py (100%) rename {settings => setup}/doctype/email_settings/email_settings.js (100%) rename {settings => setup}/doctype/email_settings/email_settings.py (100%) create mode 100644 setup/doctype/email_settings/email_settings.txt delete mode 100644 setup/doctype/erp_setup/__init__.py delete mode 100644 setup/doctype/erp_setup/erp_setup.js delete mode 100644 setup/doctype/erp_setup/erp_setup.py delete mode 100644 setup/doctype/erp_setup/erp_setup.txt rename {payroll/doctype => setup/doctype/naming_series}/__init__.py (100%) rename {settings => setup}/doctype/naming_series/naming_series.js (100%) rename {settings => setup}/doctype/naming_series/naming_series.py (100%) create mode 100644 setup/doctype/naming_series/naming_series.txt rename {payroll/doctype/absent_days_detail => setup/doctype/notification_control}/__init__.py (100%) rename {settings => setup}/doctype/notification_control/notification_control.js (100%) rename {settings => setup}/doctype/notification_control/notification_control.py (100%) create mode 100644 setup/doctype/notification_control/notification_control.txt rename {payroll/doctype/action_detail => setup/doctype/permission_control}/__init__.py (100%) rename {settings => setup}/doctype/permission_control/permission_control.py (100%) create mode 100644 setup/doctype/permission_control/permission_control.txt rename {payroll/doctype/appraisal => setup/doctype/print_heading}/__init__.py (100%) rename {settings => setup}/doctype/print_heading/print_heading.js (100%) rename {settings => setup}/doctype/print_heading/print_heading.py (100%) create mode 100644 setup/doctype/print_heading/print_heading.txt rename {payroll/doctype/appraisal_detail => setup/doctype/role}/__init__.py (100%) rename {roles => setup}/doctype/role/role.js (100%) rename {roles => setup}/doctype/role/role.py (100%) create mode 100644 setup/doctype/role/role.txt rename {payroll/doctype/attendance => setup/doctype/setup_wizard_control}/__init__.py (100%) rename {settings => setup}/doctype/setup_wizard_control/setup_wizard_control.py (100%) create mode 100644 setup/doctype/setup_wizard_control/setup_wizard_control.txt rename {payroll/doctype/attendance_control_panel => setup/doctype/sms_settings}/__init__.py (100%) mode change 100644 => 100755 create mode 100755 setup/doctype/sms_settings/sms_settings.txt rename {payroll/doctype/branch => setup/doctype/static_parameter_detail}/__init__.py (100%) mode change 100644 => 100755 create mode 100755 setup/doctype/static_parameter_detail/static_parameter_detail.txt rename {payroll/doctype/chapter_vi_a_detail => setup/doctype/update_series}/__init__.py (100%) create mode 100644 setup/doctype/update_series/update_series.txt rename {payroll/doctype/city => setup/doctype/workflow_action_detail}/__init__.py (100%) create mode 100644 setup/doctype/workflow_action_detail/workflow_action_detail.txt rename {payroll/doctype/condition_detail => setup/doctype/workflow_engine}/__init__.py (100%) rename {settings => setup}/doctype/workflow_engine/workflow_engine.py (100%) create mode 100644 setup/doctype/workflow_engine/workflow_engine.txt rename {payroll/doctype/declaration_detail => setup/doctype/workflow_rule}/__init__.py (100%) rename {settings => setup}/doctype/workflow_rule/workflow_rule.js (100%) rename {settings => setup}/doctype/workflow_rule/workflow_rule.py (100%) create mode 100644 setup/doctype/workflow_rule/workflow_rule.txt rename {payroll/doctype/deduction_detail => setup/doctype/workflow_rule_detail}/__init__.py (100%) create mode 100644 setup/doctype/workflow_rule_detail/workflow_rule_detail.txt delete mode 100644 srm/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt delete mode 100644 srm/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt delete mode 100644 srm/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt delete mode 100644 srm/__init__.py delete mode 100644 srm/doctype/__init__.py delete mode 100644 srm/doctype/indent/__init__.py delete mode 100644 srm/doctype/indent/indent.txt delete mode 100644 srm/doctype/indent_detail/__init__.py delete mode 100644 srm/doctype/indent_detail/indent_detail.txt delete mode 100644 srm/doctype/landed_cost_detail/__init__.py delete mode 100644 srm/doctype/landed_cost_detail/landed_cost_detail.txt delete mode 100644 srm/doctype/lc_pr_detail/__init__.py delete mode 100644 srm/doctype/lc_pr_detail/lc_pr_detail.txt delete mode 100644 srm/doctype/po_detail/__init__.py delete mode 100644 srm/doctype/po_detail/po_detail.txt delete mode 100644 srm/doctype/po_raw_material_detail/__init__.py delete mode 100644 srm/doctype/po_raw_material_detail/po_raw_material_detail.txt delete mode 100644 srm/doctype/pr_raw_material_detail/__init__.py delete mode 100644 srm/doctype/pr_raw_material_detail/pr_raw_material_detail.txt delete mode 100644 srm/doctype/purchase_common/__init__.py delete mode 100644 srm/doctype/purchase_common/purchase_common.txt delete mode 100644 srm/doctype/purchase_order/__init__.py delete mode 100644 srm/doctype/purchase_order/purchase_order.txt delete mode 100644 srm/doctype/purchase_other_charges/__init__.py delete mode 100644 srm/doctype/purchase_other_charges/purchase_other_charges.txt delete mode 100644 srm/doctype/qa_inspection_report/__init__.py delete mode 100644 srm/doctype/qa_inspection_report/qa_inspection_report.txt delete mode 100644 srm/doctype/qa_specification_detail/__init__.py delete mode 100644 srm/doctype/qa_specification_detail/qa_specification_detail.txt delete mode 100644 srm/doctype/raw_materials_supplied/__init__.py delete mode 100644 srm/doctype/raw_materials_supplied/raw_materials_supplied.txt delete mode 100644 srm/doctype/supplier/__init__.py delete mode 100644 srm/doctype/supplier/supplier.txt delete mode 100755 srm/doctype/supplier_quotation/__init__.py delete mode 100755 srm/doctype/supplier_quotation/supplier_quotation.txt delete mode 100644 srm/page/__init__.py delete mode 100644 srm/search_criteria/__init__.py delete mode 100644 srm/search_criteria/itemwise_purchase_details/__init__.py delete mode 100644 srm/search_criteria/itemwise_receipt_details/__init__.py delete mode 100644 srm/search_criteria/pending_po_items_to_bill/__init__.py delete mode 100644 srm/search_criteria/pending_po_items_to_receive/__init__.py delete mode 100644 srm/search_criteria/purchase_in_transit/__init__.py rename event_handlers.py => startup/event_handlers.py (100%) rename {accounts => stock}/DocType Label/QA Inspection Report/QA Inspection Report.txt (100%) rename {mapper => stock}/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt (100%) rename {mapper => stock}/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt (100%) rename {mapper => stock}/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt (100%) rename {mapper => stock}/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt (100%) rename {material_management => stock}/Item Group/All Item Groups/All Item Groups.txt (100%) rename {material_management => stock}/Item Group/Default/Default.txt (100%) rename material_management/Module Def/Material Management/Material Management.txt => stock/Module Def/Stock/Stock.txt (66%) rename {material_management => stock}/Print Format/Purchase Receipt Format/Purchase Receipt Format.txt (100%) rename {roles => stock}/Role/Material Manager/Material Manager.txt (100%) rename {roles => stock}/Role/Material Master Manager/Material Master Manager.txt (100%) rename {roles => stock}/Role/Material User/Material User.txt (100%) rename {roles => stock}/Role/Quality Manager/Quality Manager.txt (100%) rename {payroll/doctype/deduction_type => stock}/__init__.py (100%) rename {payroll/doctype/department => stock/doctype}/__init__.py (100%) rename {payroll/doctype/designation => stock/doctype/batch}/__init__.py (100%) create mode 100644 stock/doctype/batch/batch.txt rename {payroll/doctype/earn_deduction_detail => stock/doctype/bin}/__init__.py (100%) rename {material_management => stock}/doctype/bin/bin.py (100%) create mode 100644 stock/doctype/bin/bin.txt rename {payroll/doctype/earning_detail => stock/doctype/delivery_note}/__init__.py (100%) rename {material_management => stock}/doctype/delivery_note/delivery_note.js (100%) rename {material_management => stock}/doctype/delivery_note/delivery_note.py (100%) create mode 100644 stock/doctype/delivery_note/delivery_note.txt rename {material_management => stock}/doctype/delivery_note/tests.py (100%) rename {payroll/doctype/earning_type => stock/doctype/delivery_note_detail}/__init__.py (100%) create mode 100644 stock/doctype/delivery_note_detail/delivery_note_detail.txt rename {payroll/doctype/educational_qualifications => stock/doctype/delivery_note_packing_detail}/__init__.py (100%) create mode 100644 stock/doctype/delivery_note_packing_detail/delivery_note_packing_detail.txt rename {payroll/doctype/educational_qualifications_detail => stock/doctype/item}/__init__.py (100%) rename {material_management => stock}/doctype/item/item.js (100%) rename {material_management => stock}/doctype/item/item.py (100%) create mode 100644 stock/doctype/item/item.txt rename {payroll/doctype/employee => stock/doctype/item_specification_detail}/__init__.py (100%) create mode 100644 stock/doctype/item_specification_detail/item_specification_detail.txt rename {payroll/doctype/employee_profile => stock/doctype/item_tax}/__init__.py (100%) create mode 100644 stock/doctype/item_tax/item_tax.txt rename {payroll/doctype/employment_type => stock/doctype/landed_cost_detail}/__init__.py (100%) create mode 100644 stock/doctype/landed_cost_detail/landed_cost_detail.txt rename {payroll/doctype/expense_type => stock/doctype/landed_cost_master}/__init__.py (100%) rename {material_management => stock}/doctype/landed_cost_master/landed_cost_master.js (100%) create mode 100644 stock/doctype/landed_cost_master/landed_cost_master.txt rename {payroll/doctype/expense_voucher => stock/doctype/landed_cost_master_detail}/__init__.py (100%) create mode 100644 stock/doctype/landed_cost_master_detail/landed_cost_master_detail.txt rename {payroll/doctype/expense_voucher_detail => stock/doctype/landed_cost_wizard}/__init__.py (100%) rename {material_management => stock}/doctype/landed_cost_wizard/landed_cost_wizard.js (100%) rename {material_management => stock}/doctype/landed_cost_wizard/landed_cost_wizard.py (100%) create mode 100644 stock/doctype/landed_cost_wizard/landed_cost_wizard.txt rename {payroll/doctype/experience_in_company_detail => stock/doctype/lc_pr_detail}/__init__.py (100%) create mode 100644 stock/doctype/lc_pr_detail/lc_pr_detail.txt rename {payroll/doctype/grade => stock/doctype/purchase_receipt}/__init__.py (100%) rename {material_management => stock}/doctype/purchase_receipt/purchase_receipt.js (100%) rename {material_management => stock}/doctype/purchase_receipt/purchase_receipt.py (100%) create mode 100644 stock/doctype/purchase_receipt/purchase_receipt.txt rename {payroll/doctype/holiday_list => stock/doctype/purchase_receipt_detail}/__init__.py (100%) create mode 100644 stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt rename {payroll/doctype/holiday_list_detail => stock/doctype/ref_rate_detail}/__init__.py (100%) create mode 100644 stock/doctype/ref_rate_detail/ref_rate_detail.txt rename {payroll/doctype/invest_80_declaration_detail => stock/doctype/sales_and_purchase_return_wizard}/__init__.py (100%) rename {material_management => stock}/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.js (100%) rename {material_management => stock}/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.py (100%) create mode 100644 stock/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.txt rename {payroll/doctype/it_checklist => stock/doctype/sales_bom}/__init__.py (100%) rename {material_management => stock}/doctype/sales_bom/sales_bom.js (100%) rename {material_management => stock}/doctype/sales_bom/sales_bom.py (100%) create mode 100644 stock/doctype/sales_bom/sales_bom.txt rename {payroll/doctype/kra_sheet => stock/doctype/sales_bom_detail}/__init__.py (100%) create mode 100644 stock/doctype/sales_bom_detail/sales_bom_detail.txt rename {payroll/doctype/kra_template => stock/doctype/serial_no}/__init__.py (100%) rename {material_management => stock}/doctype/serial_no/serial_no.js (100%) rename {material_management => stock}/doctype/serial_no/serial_no.py (100%) create mode 100644 stock/doctype/serial_no/serial_no.txt rename {payroll/doctype/leave_allocation => stock/doctype/stock_entry}/__init__.py (100%) mode change 100755 => 100644 rename {material_management => stock}/doctype/stock_entry/stock_entry.js (100%) rename {material_management => stock}/doctype/stock_entry/stock_entry.py (100%) rename {material_management => stock}/doctype/stock_entry/stock_entry.py~ (100%) create mode 100644 stock/doctype/stock_entry/stock_entry.txt rename {payroll/doctype/leave_applicable_detail => stock/doctype/stock_entry_detail}/__init__.py (100%) create mode 100644 stock/doctype/stock_entry_detail/stock_entry_detail.txt rename {payroll/doctype/leave_application => stock/doctype/stock_ledger}/__init__.py (100%) mode change 100755 => 100644 rename {material_management => stock}/doctype/stock_ledger/stock_ledger.py (100%) create mode 100644 stock/doctype/stock_ledger/stock_ledger.txt rename {payroll/doctype/leave_control_panel => stock/doctype/stock_ledger_entry}/__init__.py (100%) rename {material_management => stock}/doctype/stock_ledger_entry/stock_ledger_entry.py (100%) create mode 100644 stock/doctype/stock_ledger_entry/stock_ledger_entry.txt rename {payroll/doctype/leave_detail => stock/doctype/stock_reconciliation}/__init__.py (100%) rename {material_management => stock}/doctype/stock_reconciliation/stock_reconciliation.js (100%) rename {material_management => stock}/doctype/stock_reconciliation/stock_reconciliation.py (100%) create mode 100644 stock/doctype/stock_reconciliation/stock_reconciliation.txt rename {payroll/doctype/leave_type => stock/doctype/stock_uom_replace_utility}/__init__.py (100%) rename {material_management => stock}/doctype/stock_uom_replace_utility/stock_uom_replace_utility.js (100%) rename {material_management => stock}/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py (100%) create mode 100644 stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt rename {payroll/doctype/leave_type_detail => stock/doctype/uom_conversion_detail}/__init__.py (100%) create mode 100644 stock/doctype/uom_conversion_detail/uom_conversion_detail.txt rename {payroll/doctype/other_income_detail => stock/doctype/valuation_control}/__init__.py (100%) rename {material_management => stock}/doctype/valuation_control/valuation_control.py (100%) rename {material_management => stock}/doctype/valuation_control/valuation_control.py~ (100%) create mode 100644 stock/doctype/valuation_control/valuation_control.txt rename {payroll/doctype/payroll_rule => stock/doctype/warehouse}/__init__.py (100%) rename {material_management => stock}/doctype/warehouse/warehouse.js (100%) rename {material_management => stock}/doctype/warehouse/warehouse.py (100%) create mode 100644 stock/doctype/warehouse/warehouse.txt rename {payroll/doctype/previous_experience_detail => stock/page}/__init__.py (100%) rename {payroll/doctype/professional_training_details => stock/search_criteria}/__init__.py (100%) rename {payroll/doctype/rule_engine => stock/search_criteria/itemwise_price_list}/__init__.py (100%) rename {material_management => stock}/search_criteria/itemwise_price_list/itemwise_price_list.js (100%) rename {material_management => stock}/search_criteria/itemwise_price_list/itemwise_price_list.txt (100%) rename {payroll/doctype/salary_slip => stock/search_criteria/shortage_to_indent}/__init__.py (100%) rename {material_management => stock}/search_criteria/shortage_to_indent/shortage_to_indent.js (100%) rename {material_management => stock}/search_criteria/shortage_to_indent/shortage_to_indent.py (100%) rename {material_management => stock}/search_criteria/shortage_to_indent/shortage_to_indent.txt (100%) rename {payroll/doctype/salary_slip_control_panel => stock/search_criteria/stock_aging_report}/__init__.py (100%) rename {material_management => stock}/search_criteria/stock_aging_report/stock_aging_report.js (100%) rename {material_management => stock}/search_criteria/stock_aging_report/stock_aging_report.py (100%) rename {material_management => stock}/search_criteria/stock_aging_report/stock_aging_report.txt (100%) rename {payroll/doctype/salary_structure => stock/search_criteria/stock_ledger}/__init__.py (100%) rename {material_management => stock}/search_criteria/stock_ledger/stock_ledger.js (100%) rename {material_management => stock}/search_criteria/stock_ledger/stock_ledger.txt (100%) rename {payroll/doctype/ss_deduction_detail => stock/search_criteria/stock_level}/__init__.py (100%) rename {material_management => stock}/search_criteria/stock_level/stock_level.js (100%) rename {material_management => stock}/search_criteria/stock_level/stock_level.py (100%) rename {material_management => stock}/search_criteria/stock_level/stock_level.txt (100%) rename {payroll/doctype/ss_earning_detail => stock/search_criteria/stock_report}/__init__.py (100%) rename {material_management => stock}/search_criteria/stock_report/stock_report.js (100%) rename {material_management => stock}/search_criteria/stock_report/stock_report.py (100%) rename {material_management => stock}/search_criteria/stock_report/stock_report.txt (100%) rename {material_management => stock}/tests.py (100%) rename {accounts => support}/DocType Label/Ticket/Ticket.txt (100%) rename {mapper => support}/DocType Mapper/Customer Issue-Maintenance Visit/Customer Issue-Maintenance Visit.txt (100%) rename {mapper => support}/DocType Mapper/Sales Order-Maintenance Schedule/Sales Order-Maintenance Schedule.txt (100%) rename {mapper => support}/DocType Mapper/Sales Order-Maintenance Visit/Sales Order-Maintenance Visit.txt (100%) create mode 100644 support/Module Def/Support/Support.txt rename {roles => support}/Role/Maintenance Manager/Maintenance Manager.txt (100%) rename {roles => support}/Role/Maintenance User/Maintenance User.txt (100%) rename {roles => support}/Role/Support Manager/Support Manager.txt (100%) rename {roles => support}/Role/Support Team/Support Team.txt (100%) rename {payroll/page => support}/__init__.py (100%) rename {payroll/search_criteria => support/doctype}/__init__.py (100%) rename {payroll/search_criteria/appraisal_custom => support/doctype/customer_issue}/__init__.py (100%) rename {maintenance => support}/doctype/customer_issue/customer_issue.js (100%) rename {maintenance => support}/doctype/customer_issue/customer_issue.py (100%) create mode 100644 support/doctype/customer_issue/customer_issue.txt rename {payroll/search_criteria/datewise_leave_report => support/doctype/item_maintenance_detail}/__init__.py (100%) create mode 100644 support/doctype/item_maintenance_detail/item_maintenance_detail.txt rename {payroll/search_criteria/datewise_leave_report1 => support/doctype/maintenance_schedule}/__init__.py (100%) rename {maintenance => support}/doctype/maintenance_schedule/maintenance_schedule.js (100%) rename {maintenance => support}/doctype/maintenance_schedule/maintenance_schedule.py (100%) create mode 100644 support/doctype/maintenance_schedule/maintenance_schedule.txt rename {payroll/search_criteria/datewise_leave_report2 => support/doctype/maintenance_schedule_detail}/__init__.py (100%) create mode 100644 support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt rename {payroll/search_criteria/employee_appraisals => support/doctype/maintenance_visit}/__init__.py (100%) rename {maintenance => support}/doctype/maintenance_visit/maintenance_visit.js (100%) rename {maintenance => support}/doctype/maintenance_visit/maintenance_visit.py (100%) create mode 100644 support/doctype/maintenance_visit/maintenance_visit.txt rename {payroll/search_criteria/employee_details => support/doctype/maintenance_visit_detail}/__init__.py (100%) create mode 100644 support/doctype/maintenance_visit_detail/maintenance_visit_detail.txt rename {maintenance => support}/doctype/support_ticket/__init__.py (100%) rename {maintenance => support}/doctype/support_ticket/support_ticket.js (100%) rename {maintenance => support}/doctype/support_ticket/support_ticket.py (100%) create mode 100644 support/doctype/support_ticket/support_ticket.txt rename {payroll/search_criteria/employee_details1 => support/doctype/support_ticket_response}/__init__.py (100%) create mode 100644 support/doctype/support_ticket_response/support_ticket_response.txt rename {payroll/search_criteria/employee_details2 => support/search_criteria}/__init__.py (100%) rename {payroll/search_criteria/employee_in_company_experience => support/search_criteria/amc_summary}/__init__.py (100%) rename {maintenance => support}/search_criteria/amc_summary/amc_summary.js (100%) rename {maintenance => support}/search_criteria/amc_summary/amc_summary.py (100%) rename {maintenance => support}/search_criteria/amc_summary/amc_summary.txt (100%) rename {payroll/search_criteria/employee_in_company_experience1 => support/search_criteria/customer_issues}/__init__.py (100%) rename {maintenance => support}/search_criteria/customer_issues/customer_issues.js (100%) rename {maintenance => support}/search_criteria/customer_issues/customer_issues.txt (100%) rename {payroll/search_criteria/employee_in_company_experience2 => support/search_criteria/maintenance_orderwise_pending_amount_to_bill}/__init__.py (100%) rename {maintenance => support}/search_criteria/maintenance_orderwise_pending_amount_to_bill/maintenance_orderwise_pending_amount_to_bill.js (100%) rename {maintenance => support}/search_criteria/maintenance_orderwise_pending_amount_to_bill/maintenance_orderwise_pending_amount_to_bill.txt (100%) rename {payroll/search_criteria/employee_information => support/search_criteria/maintenance_schedule_details}/__init__.py (100%) rename {maintenance => support}/search_criteria/maintenance_schedule_details/maintenance_schedule_details.js (100%) rename {maintenance => support}/search_criteria/maintenance_schedule_details/maintenance_schedule_details.txt (100%) rename {payroll/search_criteria/employees_birthday => support/search_criteria/warranty_amc_expiry_details}/__init__.py (100%) rename {maintenance => support}/search_criteria/warranty_amc_expiry_details/warranty_amc_expiry_details.js (100%) rename {maintenance => support}/search_criteria/warranty_amc_expiry_details/warranty_amc_expiry_details.txt (100%) rename {payroll/search_criteria/employees_birthday1 => support/search_criteria/warranty_amc_summary}/__init__.py (100%) rename {maintenance => support}/search_criteria/warranty_amc_summary/warranty_amc_summary.js (100%) rename {maintenance => support}/search_criteria/warranty_amc_summary/warranty_amc_summary.py (100%) rename {maintenance => support}/search_criteria/warranty_amc_summary/warranty_amc_summary.sql (100%) rename {maintenance => support}/search_criteria/warranty_amc_summary/warranty_amc_summary.txt (100%) delete mode 100644 tools/Module Def/Tools/Tools.txt delete mode 100644 tools/__init__.py delete mode 100644 tools/doctype/__init__.py delete mode 100644 tools/doctype/activity_dashboard_control/__init__.py delete mode 100644 tools/doctype/activity_dashboard_control/activity_dashboard_control.txt delete mode 100644 tools/doctype/address/__init__.py delete mode 100644 tools/doctype/address/address.txt delete mode 100644 tools/doctype/business_letter/__init__.py delete mode 100644 tools/doctype/business_letter/business_letter.js delete mode 100644 tools/doctype/business_letter/business_letter.py delete mode 100644 tools/doctype/business_letter/business_letter.txt delete mode 100644 tools/doctype/business_letter_template/__init__.py delete mode 100644 tools/doctype/business_letter_template/business_letter_template.js delete mode 100644 tools/doctype/business_letter_template/business_letter_template.txt delete mode 100644 tools/doctype/business_letter_type/__init__.py delete mode 100644 tools/doctype/business_letter_type/business_letter_type.js delete mode 100644 tools/doctype/business_letter_type/business_letter_type.txt delete mode 100644 tools/doctype/contact/__init__.py delete mode 100644 tools/doctype/contact/contact.txt delete mode 100644 tools/doctype/contact_detail/__init__.py delete mode 100644 tools/doctype/contact_detail/contact_detail.txt delete mode 100644 tools/doctype/file_browser_control/__init__.py delete mode 100644 tools/doctype/file_browser_control/file_browser_control.txt delete mode 100644 tools/doctype/rating_template/__init__.py delete mode 100644 tools/doctype/rating_template/rating_template.txt delete mode 100644 tools/doctype/rating_template_detail/__init__.py delete mode 100644 tools/doctype/rating_template_detail/rating_template_detail.txt delete mode 100644 tools/doctype/rating_widget_control/__init__.py delete mode 100644 tools/doctype/rating_widget_control/rating_widget_control.py delete mode 100644 tools/doctype/rating_widget_control/rating_widget_control.txt delete mode 100644 tools/doctype/rating_widget_record/__init__.py delete mode 100644 tools/doctype/rating_widget_record/rating_widget_record.txt delete mode 100644 tools/doctype/receiver_detail/__init__.py delete mode 100644 tools/doctype/receiver_detail/receiver_detail.txt delete mode 100755 tools/doctype/rename_tool/__init__.py delete mode 100755 tools/doctype/rename_tool/rename_tool.txt delete mode 100644 tools/doctype/reposting_tool/__init__.py delete mode 100644 tools/doctype/reposting_tool/reposting_tool.txt delete mode 100644 tools/doctype/sms_control/__init__.py delete mode 100644 tools/doctype/sms_control/sms_control.txt delete mode 100644 tools/doctype/sms_log/__init__.py delete mode 100644 tools/doctype/sms_log/sms_log.txt delete mode 100644 tools/doctype/todo_item/__init__.py delete mode 100644 tools/doctype/todo_item/todo_item.txt delete mode 100644 tools/doctype/trash_control/__init__.py delete mode 100644 tools/doctype/trash_control/trash_control.txt delete mode 100644 tools/doctype/tweet/__init__.py delete mode 100644 tools/doctype/tweet/tweet.txt delete mode 100644 tools/doctype/while_you_were_out/__init__.py delete mode 100644 tools/doctype/while_you_were_out/while_you_were_out.txt delete mode 100644 tools/doctype/wiki_control/__init__.py delete mode 100644 tools/doctype/wiki_control/wiki_control.py delete mode 100644 tools/doctype/wiki_control/wiki_control.txt delete mode 100644 tools/doctype/wiki_history/__init__.py delete mode 100644 tools/doctype/wiki_history/wiki_history.txt delete mode 100644 tools/doctype/wiki_page/__init__.py delete mode 100644 tools/doctype/wiki_page/wiki_page.txt delete mode 100644 tools/page/__init__.py delete mode 100644 tools/page/file_browser/__init__.py delete mode 100644 tools/page/file_browser/file_browser.txt delete mode 100644 tools/page/messages/__init__.py delete mode 100644 tools/page/trash/__init__.py delete mode 100644 tools/page/trash/trash.txt delete mode 100644 tools/page/wip_monitor/__init__.py delete mode 100644 tools/page/wip_monitor/wip_monitor.txt rename {payroll/search_criteria/employeewise_balance_leave_report => utilities/doctype}/__init__.py (100%) rename {payroll/search_criteria/employeewise_leave_transaction_details => utilities/doctype/activity_dashboard_control}/__init__.py (100%) rename {tools => utilities}/doctype/activity_dashboard_control/activity_dashboard_control.py (100%) create mode 100644 utilities/doctype/activity_dashboard_control/activity_dashboard_control.txt rename {payroll/search_criteria/expense_vouchers => utilities/doctype/address}/__init__.py (100%) rename {tools => utilities}/doctype/address/address.js (100%) rename {tools => utilities}/doctype/address/address.py (100%) create mode 100644 utilities/doctype/address/address.txt rename {payroll/search_criteria/installed_items => utilities/doctype/contact}/__init__.py (100%) rename {tools => utilities}/doctype/contact/contact.js (100%) rename {tools => utilities}/doctype/contact/contact.py (100%) create mode 100644 utilities/doctype/contact/contact.txt rename {payroll/search_criteria/monthly_attendance_details => utilities/doctype/contact_detail}/__init__.py (100%) create mode 100644 utilities/doctype/contact_detail/contact_detail.txt rename {payroll/search_criteria/monthly_salary_register => utilities/doctype/doctype_label}/__init__.py (100%) rename {application_internal => utilities}/doctype/doctype_label/doctype_label.txt (100%) rename {payroll/search_criteria/monthly_salary_register1 => utilities/doctype/doctype_property_setter}/__init__.py (100%) rename {application_internal => utilities}/doctype/doctype_property_setter/doctype_property_setter.py (100%) create mode 100644 utilities/doctype/doctype_property_setter/doctype_property_setter.txt rename {payroll/search_criteria/monthly_salary_register2 => utilities/doctype/file_browser_control}/__init__.py (100%) rename {tools => utilities}/doctype/file_browser_control/file_browser_control.py (100%) create mode 100644 utilities/doctype/file_browser_control/file_browser_control.txt rename {payroll/search_criteria/new_or_left_employees_for_a_month => utilities/doctype/gl_mapper}/__init__.py (100%) create mode 100644 utilities/doctype/gl_mapper/gl_mapper.txt rename {payroll/search_criteria/pending_appraisals => utilities/doctype/gl_mapper_detail}/__init__.py (100%) create mode 100644 utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt rename {payroll/search_criteria/pending_expense_vouchers => utilities/doctype/menu_control}/__init__.py (100%) rename {application_internal => utilities}/doctype/menu_control/menu_control.js (100%) rename {application_internal => utilities}/doctype/menu_control/menu_control.py (100%) create mode 100644 utilities/doctype/menu_control/menu_control.txt rename {payroll/search_criteria/salary_register => utilities/doctype/patch_util}/__init__.py (100%) rename {application_internal => utilities}/doctype/patch_util/patch_util.py (100%) create mode 100644 utilities/doctype/patch_util/patch_util.txt rename {payroll/search_criteria/salary_slips => utilities/doctype/production_tips_common}/__init__.py (100%) rename {application_internal => utilities}/doctype/production_tips_common/production_tips_common.js (100%) create mode 100644 utilities/doctype/production_tips_common/production_tips_common.txt rename {payroll/search_criteria/salary_slips1 => utilities/doctype/profile_control}/__init__.py (100%) rename {application_internal => utilities}/doctype/profile_control/profile_control.py (100%) create mode 100644 utilities/doctype/profile_control/profile_control.txt rename {payroll/search_criteria/salary_structure_details => utilities/doctype/receiver_detail}/__init__.py (100%) create mode 100644 utilities/doctype/receiver_detail/receiver_detail.txt rename {payroll/search_criteria/salary_structure_details3 => utilities/doctype/rename_tool}/__init__.py (100%) mode change 100644 => 100755 rename {tools => utilities}/doctype/rename_tool/rename_tool.js (100%) rename {tools => utilities}/doctype/rename_tool/rename_tool.py (100%) create mode 100755 utilities/doctype/rename_tool/rename_tool.txt rename {payroll/search_criteria/salary_structure_details4 => utilities/doctype/reposting_tool}/__init__.py (100%) rename {tools => utilities}/doctype/reposting_tool/reposting_tool.js (100%) rename {tools => utilities}/doctype/reposting_tool/reposting_tool.py (100%) create mode 100644 utilities/doctype/reposting_tool/reposting_tool.txt rename {projects/search_criteria/projectwise_delivered_qty_and_costs1 => utilities/doctype/sms_center}/__init__.py (100%) rename {application_internal => utilities}/doctype/sms_center/sms_center.js (100%) rename {application_internal => utilities}/doctype/sms_center/sms_center.py (100%) rename {application_internal => utilities}/doctype/sms_center/sms_center.txt (100%) rename {projects/search_criteria/projectwise_delivered_qty_and_costs2 => utilities/doctype/sms_control}/__init__.py (100%) rename {tools => utilities}/doctype/sms_control/sms_control.js (100%) rename {tools => utilities}/doctype/sms_control/sms_control.py (100%) create mode 100644 utilities/doctype/sms_control/sms_control.txt rename {projects/search_criteria/projectwise_pending_qty_and_costs1 => utilities/doctype/sms_log}/__init__.py (100%) create mode 100644 utilities/doctype/sms_log/sms_log.txt rename {projects/search_criteria/projectwise_pending_qty_and_costs2 => utilities/doctype/sso_control}/__init__.py (100%) rename {application_internal => utilities}/doctype/sso_control/sso_control.py (100%) create mode 100644 utilities/doctype/sso_control/sso_control.txt rename {roles => utilities/doctype/todo_item}/__init__.py (100%) create mode 100644 utilities/doctype/todo_item/todo_item.txt rename {roles/doctype => utilities/doctype/trash_control}/__init__.py (100%) rename {tools => utilities}/doctype/trash_control/trash_control.py (100%) create mode 100644 utilities/doctype/trash_control/trash_control.txt rename {roles/doctype/role => utilities/doctype/wn_erp_client_control}/__init__.py (100%) rename {application_internal => utilities}/doctype/wn_erp_client_control/wn_erp_client_control.py (100%) create mode 100644 utilities/doctype/wn_erp_client_control/wn_erp_client_control.txt rename {settings => utilities/page}/__init__.py (100%) rename {settings/doctype => utilities/page/file_browser}/__init__.py (100%) rename {tools => utilities}/page/file_browser/file_browser.html (100%) rename {tools => utilities}/page/file_browser/file_browser.js (100%) create mode 100644 utilities/page/file_browser/file_browser.txt rename {settings/doctype/authorization_control => utilities/page/messages}/__init__.py (100%) rename {tools => utilities}/page/messages/messages.html (100%) rename {tools => utilities}/page/messages/messages.js (100%) rename {tools => utilities}/page/messages/messages.txt (100%) rename {tools => utilities}/page/messages/messages_static.html (100%) rename {settings/doctype/authorization_rule => utilities/page/trash}/__init__.py (100%) rename {tools => utilities}/page/trash/trash.html (100%) rename {tools => utilities}/page/trash/trash.js (100%) create mode 100644 utilities/page/trash/trash.txt rename {settings/doctype/email_settings => utilities/page/wip_monitor}/__init__.py (100%) rename {tools => utilities}/page/wip_monitor/wip_monitor.html (100%) rename {tools => utilities}/page/wip_monitor/wip_monitor.js (100%) create mode 100644 utilities/page/wip_monitor/wip_monitor.txt diff --git a/Dependencies b/Dependencies deleted file mode 100755 index 173be1ffaf..0000000000 --- a/Dependencies +++ /dev/null @@ -1,4 +0,0 @@ -Install these python packages(using easy_install?? - -1.suds -2. diff --git a/INSTALL.txt b/INSTALL similarity index 100% rename from INSTALL.txt rename to INSTALL diff --git a/mapper/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt b/accounts/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt similarity index 100% rename from mapper/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt rename to accounts/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt diff --git a/mapper/DocType Mapper/Project-Receivable Voucher/Project-Receivable Voucher.txt b/accounts/DocType Mapper/Project-Receivable Voucher/Project-Receivable Voucher.txt similarity index 100% rename from mapper/DocType Mapper/Project-Receivable Voucher/Project-Receivable Voucher.txt rename to accounts/DocType Mapper/Project-Receivable Voucher/Project-Receivable Voucher.txt diff --git a/mapper/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt b/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt similarity index 100% rename from mapper/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt rename to accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt diff --git a/mapper/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt b/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt similarity index 100% rename from mapper/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt rename to accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt diff --git a/mapper/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt b/accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt similarity index 100% rename from mapper/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt rename to accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt diff --git a/accounts/Module Def/Accounts/Accounts.txt b/accounts/Module Def/Accounts/Accounts.txt index 3b57c5d093..7eefd895c1 100644 --- a/accounts/Module Def/Accounts/Accounts.txt +++ b/accounts/Module Def/Accounts/Accounts.txt @@ -1,24 +1,23 @@ [ { '_last_update': None, - '_user_tags': None, 'creation': '2010-09-25 10:50:37', 'disabled': 'No', 'docstatus': 0, 'doctype': u'Module Def', - 'doctype_list': 'GL Mapper, Journal Voucher\nGL Mapper, Payable Voucher\nGL Mapper, Receivable Voucher\nDocType Label, Receivable Voucher\nDocType Label, Payable Voucher\nDocType Label, QA Inspection Report\nDocType Label, Ticket', + 'doctype_list': 'GL Mapper, Journal Voucher\nGL Mapper, Payable Voucher\nGL Mapper, Receivable Voucher\nDocType Label, Receivable Voucher\nDocType Label, Payable Voucher', 'file_list': 'finance.gif,FileData/00210', 'idx': None, 'is_hidden': 'No', 'last_updated_date': '2010-12-08 10:13:30', - 'modified': '2011-05-24 14:48:44', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'module_desc': 'Data about your payables, receivables and books of accounts', 'module_icon': 'Accounts.gif', 'module_label': 'Accounts', 'module_name': 'Accounts', 'module_page': None, - 'module_seq': 5, + 'module_seq': 6, 'name': 'Accounts', 'owner': 'Administrator', 'parent': None, @@ -40,7 +39,7 @@ 'hide': None, 'icon': None, 'idx': 1, - 'modified': '2011-05-25 10:54:06', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01178', 'owner': 'harshada@webnotestech.com', @@ -61,7 +60,7 @@ 'hide': None, 'icon': None, 'idx': 2, - 'modified': '2011-05-25 10:54:06', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01183', 'owner': 'harshada@webnotestech.com', @@ -82,7 +81,7 @@ 'hide': None, 'icon': None, 'idx': 3, - 'modified': '2011-05-25 10:54:06', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01012', 'owner': 'Administrator', @@ -103,7 +102,7 @@ 'hide': None, 'icon': None, 'idx': 4, - 'modified': '2011-05-25 10:54:06', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01013', 'owner': 'Administrator', @@ -124,7 +123,7 @@ 'hide': None, 'icon': None, 'idx': 5, - 'modified': '2011-05-25 10:54:06', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01014', 'owner': 'Administrator', @@ -145,7 +144,7 @@ 'hide': None, 'icon': 'table.gif', 'idx': 6, - 'modified': '2011-05-25 10:54:06', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01015', 'owner': 'Administrator', @@ -166,7 +165,7 @@ 'hide': None, 'icon': None, 'idx': 7, - 'modified': '2011-05-25 10:54:06', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01016', 'owner': 'saumil@webnotestech.com', @@ -187,7 +186,7 @@ 'hide': None, 'icon': None, 'idx': 8, - 'modified': '2011-05-25 10:54:06', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01017', 'owner': 'Administrator', @@ -208,7 +207,7 @@ 'hide': None, 'icon': None, 'idx': 9, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01018', 'owner': 'nabin@webnotestech.com', @@ -229,7 +228,7 @@ 'hide': None, 'icon': None, 'idx': 10, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01019', 'owner': 'Administrator', @@ -250,7 +249,7 @@ 'hide': None, 'icon': None, 'idx': 11, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01188', 'owner': 'Administrator', @@ -260,7 +259,7 @@ }, { 'click_function': None, - 'creation': '2011-05-25 10:54:07', + 'creation': '2011-05-24 14:47:53', 'description': 'You can export balance of selected ledgers within a specific period', 'display_name': 'Ledger Balance Export', 'doc_name': 'Ledger Balance Export', @@ -271,9 +270,9 @@ 'hide': None, 'icon': None, 'idx': 12, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', - 'name': 'MDI01302', + 'name': 'MDI01283', 'owner': 'Administrator', 'parent': 'Accounts', 'parentfield': 'items', @@ -292,7 +291,7 @@ 'hide': None, 'icon': None, 'idx': 13, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01021', 'owner': 'Administrator', @@ -313,7 +312,7 @@ 'hide': None, 'icon': None, 'idx': 14, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01022', 'owner': 'Administrator', @@ -334,7 +333,7 @@ 'hide': None, 'icon': None, 'idx': 15, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01023', 'owner': 'Administrator', @@ -355,7 +354,7 @@ 'hide': None, 'icon': None, 'idx': 16, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01024', 'owner': 'Administrator', @@ -376,7 +375,7 @@ 'hide': None, 'icon': None, 'idx': 17, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01025', 'owner': 'Administrator', @@ -397,7 +396,7 @@ 'hide': None, 'icon': None, 'idx': 18, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01026', 'owner': 'Administrator', @@ -418,7 +417,7 @@ 'hide': None, 'icon': None, 'idx': 19, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01027', 'owner': 'Administrator', @@ -439,7 +438,7 @@ 'hide': None, 'icon': None, 'idx': 20, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01028', 'owner': 'Administrator', @@ -460,7 +459,7 @@ 'hide': None, 'icon': None, 'idx': 21, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01031', 'owner': 'Administrator', @@ -481,7 +480,7 @@ 'hide': None, 'icon': None, 'idx': 22, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01032', 'owner': 'Administrator', @@ -502,7 +501,7 @@ 'hide': None, 'icon': None, 'idx': 23, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01033', 'owner': 'Administrator', @@ -523,7 +522,7 @@ 'hide': None, 'icon': None, 'idx': 24, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01034', 'owner': 'Administrator', @@ -544,7 +543,7 @@ 'hide': None, 'icon': None, 'idx': 25, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01267', 'owner': 'Administrator', @@ -565,7 +564,7 @@ 'hide': None, 'icon': None, 'idx': 26, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01035', 'owner': 'Administrator', @@ -586,7 +585,7 @@ 'hide': None, 'icon': None, 'idx': 27, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01036', 'owner': 'Administrator', @@ -607,7 +606,7 @@ 'hide': None, 'icon': None, 'idx': 28, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01038', 'owner': 'Administrator', @@ -628,7 +627,7 @@ 'hide': None, 'icon': None, 'idx': 29, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01039', 'owner': 'jai@webnotestech.com', @@ -649,7 +648,7 @@ 'hide': None, 'icon': None, 'idx': 30, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01040', 'owner': 'jai@webnotestech.com', @@ -670,7 +669,7 @@ 'hide': None, 'icon': None, 'idx': 31, - 'modified': '2011-05-25 10:54:07', + 'modified': '2011-07-01 09:36:04', 'modified_by': 'Administrator', 'name': 'MDI01041', 'owner': 'saumil@webnotestech.com', @@ -683,8 +682,8 @@ 'docstatus': 0, 'doctype': 'Module Def Role', 'idx': 1, - 'modified': '2011-03-07 17:24:33', - 'modified_by': 'umair@iwebnotes.com', + 'modified': '2011-07-01 09:36:04', + 'modified_by': 'Administrator', 'name': 'MDR00302', 'owner': 'Administrator', 'parent': 'Accounts', @@ -697,8 +696,8 @@ 'docstatus': 0, 'doctype': 'Module Def Role', 'idx': 2, - 'modified': '2011-03-07 17:24:33', - 'modified_by': 'umair@iwebnotes.com', + 'modified': '2011-07-01 09:36:04', + 'modified_by': 'Administrator', 'name': 'MDR00303', 'owner': 'Administrator', 'parent': 'Accounts', @@ -711,27 +710,13 @@ 'docstatus': 0, 'doctype': 'Module Def Role', 'idx': 3, - 'modified': '2011-03-07 17:24:33', - 'modified_by': 'umair@iwebnotes.com', + 'modified': '2011-07-01 09:36:04', + 'modified_by': 'Administrator', 'name': 'MDR00304', 'owner': 'Administrator', 'parent': 'Accounts', 'parentfield': 'roles', 'parenttype': 'Module Def', 'role': 'Administrator' - }, - { - 'creation': '2011-03-07 17:24:33', - 'docstatus': 0, - 'doctype': 'Module Def Role', - 'idx': 4, - 'modified': '2011-03-07 17:24:33', - 'modified_by': 'umair@iwebnotes.com', - 'name': 'MDR00328', - 'owner': 'umair@iwebnotes.com', - 'parent': 'Accounts', - 'parentfield': 'roles', - 'parenttype': 'Module Def', - 'role': 'testrole' } ] \ No newline at end of file diff --git a/roles/Role/Accounts Manager/Accounts Manager.txt b/accounts/Role/Accounts Manager/Accounts Manager.txt similarity index 100% rename from roles/Role/Accounts Manager/Accounts Manager.txt rename to accounts/Role/Accounts Manager/Accounts Manager.txt diff --git a/roles/Role/Accounts User/Accounts User.txt b/accounts/Role/Accounts User/Accounts User.txt similarity index 100% rename from roles/Role/Accounts User/Accounts User.txt rename to accounts/Role/Accounts User/Accounts User.txt diff --git a/accounts/doctype/account/account.txt b/accounts/doctype/account/account.txt index 099e97d167..9ce509c178 100644 --- a/accounts/doctype/account/account.txt +++ b/accounts/doctype/account/account.txt @@ -1,1214 +1,520 @@ +# DocType, Account [ + + # These values are common in all dictionaries { - '_last_update': '1308811650', - 'allow_attach': None, - 'allow_copy': 1, - 'allow_email': None, - 'allow_print': None, - 'allow_rename': None, - 'allow_trash': 1, - 'autoname': None, - 'change_log': None, - 'client_script': None, - 'client_script_core': None, - 'client_string': None, - 'colour': 'White:FFF', 'creation': '2010-08-08 17:08:51', - 'description': None, 'docstatus': 0, + 'modified': '2011-06-23 17:11:38', + 'modified_by': 'Administrator', + 'owner': 'Administrator' + }, + + # These values are common for all DocType + { + '_last_update': '1308829300', + 'allow_copy': 1, + 'allow_trash': 1, + 'colour': 'White:FFF', 'doctype': 'DocType', 'document_type': 'Master', - 'dt_template': None, - 'hide_heading': None, - 'hide_toolbar': None, - 'idx': None, 'in_create': 1, - 'in_dialog': None, - 'is_transaction_doc': None, - 'issingle': None, - 'istable': None, - 'max_attachments': None, - 'menu_index': None, - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', 'module': 'Accounts', - 'name': 'Account', - 'name_case': None, - 'owner': 'Administrator', - 'parent': None, - 'parent_node': None, - 'parentfield': None, - 'parenttype': None, - 'print_outline': None, - 'read_only': None, - 'read_only_onload': None, + 'name': '__common__', 'search_fields': 'debit_or_credit, group_or_ledger', 'section_style': 'Tray', - 'server_code': None, - 'server_code_compiled': None, - 'server_code_core': None, 'server_code_error': ' ', 'show_in_menu': 0, - 'smallicon': None, - 'subject': None, - 'tag_fields': None, - 'use_template': None, 'version': 133 }, + + # These values are common for all DocField + { + 'doctype': 'DocField', + 'name': '__common__', + 'parent': 'Account', + 'parentfield': 'fields', + 'parenttype': 'DocType' + }, + + # These values are common for all DocPerm + { + 'doctype': 'DocPerm', + 'name': '__common__', + 'parent': 'Account', + 'parentfield': 'permissions', + 'parenttype': 'DocType', + 'read': 1 + }, + + # DocType, Account + { + 'doctype': 'DocType', + 'name': 'Account' + }, + + # DocPerm { - 'amend': None, - 'cancel': None, - 'create': None, - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, 'doctype': 'DocPerm', - 'execute': None, 'idx': 1, - 'match': None, - 'modified': '2011-02-19 13:20:49', - 'modified_by': 'Administrator', - 'name': 'PERM00042', - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'permissions', - 'parenttype': 'DocType', 'permlevel': 0, - 'read': 1, - 'role': 'Sales User', - 'submit': None, - 'write': None + 'role': 'Sales User' }, + + # DocPerm { - 'amend': None, - 'cancel': None, - 'create': None, - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, 'doctype': 'DocPerm', - 'execute': None, 'idx': 2, - 'match': None, - 'modified': '2011-02-19 13:20:49', - 'modified_by': 'Administrator', - 'name': 'PERM00043', - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'permissions', - 'parenttype': 'DocType', 'permlevel': 0, - 'read': 1, - 'role': 'Purchase User', - 'submit': None, - 'write': None + 'role': 'Purchase User' }, + + # DocPerm { 'amend': 0, 'cancel': 1, 'create': 1, - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, 'doctype': 'DocPerm', - 'execute': None, 'idx': 3, - 'match': None, - 'modified': '2011-02-19 13:20:49', - 'modified_by': 'Administrator', - 'name': 'PERM00044', - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'permissions', - 'parenttype': 'DocType', 'permlevel': 0, - 'read': 1, 'role': 'Accounts User', 'submit': 0, 'write': 1 }, + + # DocPerm { 'amend': 0, 'cancel': 1, 'create': 1, - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, 'doctype': 'DocPerm', - 'execute': None, 'idx': 4, - 'match': None, - 'modified': '2011-02-19 13:20:49', - 'modified_by': 'Administrator', - 'name': 'PERM00045', - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'permissions', - 'parenttype': 'DocType', 'permlevel': 0, - 'read': 1, 'role': 'Accounts Manager', 'submit': 0, 'write': 1 }, + + # DocPerm { 'amend': 0, 'cancel': 0, 'create': 0, - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, 'doctype': 'DocPerm', - 'execute': None, 'idx': 5, - 'match': None, - 'modified': '2011-02-19 13:20:49', - 'modified_by': 'Administrator', - 'name': 'PERM00046', - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'permissions', - 'parenttype': 'DocType', 'permlevel': 1, - 'read': 1, 'role': 'Accounts User', 'submit': 0, 'write': 0 }, + + # DocPerm { 'amend': 0, 'cancel': 0, 'create': 0, - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, 'doctype': 'DocPerm', - 'execute': None, 'idx': 6, - 'match': None, - 'modified': '2011-02-19 13:20:49', - 'modified_by': 'Administrator', - 'name': 'PERM00047', - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'permissions', - 'parenttype': 'DocType', 'permlevel': 1, - 'read': 1, 'role': 'Accounts Manager', 'submit': 0, 'write': 0 }, + + # DocPerm { 'amend': 0, 'cancel': 0, 'create': 0, - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, 'doctype': 'DocPerm', - 'execute': None, 'idx': 7, - 'match': None, - 'modified': '2011-02-19 13:20:49', - 'modified_by': 'Administrator', - 'name': 'PERM00048', - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'permissions', - 'parenttype': 'DocType', 'permlevel': 2, - 'read': 1, 'role': 'Accounts Manager', 'submit': 0, 'write': 1 }, + + # DocPerm { 'amend': 0, 'cancel': 0, 'create': 0, - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, 'doctype': 'DocPerm', - 'execute': None, 'idx': 8, - 'match': None, - 'modified': '2011-02-19 13:20:49', - 'modified_by': 'Administrator', - 'name': 'PERM00049', - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'permissions', - 'parenttype': 'DocType', 'permlevel': 2, - 'read': 1, 'role': 'Accounts User', 'submit': 0, 'write': 0 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2011-06-23 17:11:38', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', - 'fieldname': None, 'fieldtype': 'Section Break', - 'hidden': None, - 'icon': None, 'idx': 1, - 'in_filter': None, 'label': 'Properties', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL05605', - 'no_column': None, - 'no_copy': None, - 'oldfieldname': None, 'oldfieldtype': 'Section Break', - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', - 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': None, - 'trigger': None, - 'width': None + 'permlevel': 0 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2011-06-23 17:11:38', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', - 'fieldname': None, 'fieldtype': 'Column Break', - 'hidden': None, - 'icon': None, 'idx': 2, - 'in_filter': None, - 'label': None, - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL05606', - 'no_column': None, - 'no_copy': None, - 'oldfieldname': None, - 'oldfieldtype': None, - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': None, - 'trigger': None, 'width': '50%' }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'account_name', 'fieldtype': 'Data', - 'hidden': None, - 'icon': None, 'idx': 3, 'in_filter': 1, 'label': 'Account Name', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00433', - 'no_column': None, 'no_copy': 1, 'oldfieldname': 'account_name', 'oldfieldtype': 'Data', - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', 'permlevel': 1, - 'print_hide': None, - 'report_hide': None, 'reqd': 1, - 'search_index': 1, - 'trigger': None, - 'width': None + 'search_index': 1 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'parent_account', 'fieldtype': 'Link', - 'hidden': None, - 'icon': None, 'idx': 4, - 'in_filter': None, 'label': 'Parent Account', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00434', - 'no_column': None, - 'no_copy': None, 'oldfieldname': 'parent_account', 'oldfieldtype': 'Link', 'options': 'Account', - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, 'search_index': 1, - 'trigger': 'Client', - 'width': None + 'trigger': 'Client' }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'level', 'fieldtype': 'Int', 'hidden': 1, - 'icon': None, 'idx': 5, - 'in_filter': None, 'label': 'Level', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00435', - 'no_column': None, - 'no_copy': None, 'oldfieldname': 'level', 'oldfieldtype': 'Int', - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', 'permlevel': 1, - 'print_hide': 1, - 'report_hide': None, - 'reqd': None, - 'search_index': None, - 'trigger': None, - 'width': None + 'print_hide': 1 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', 'default': 'Ledger', - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'group_or_ledger', 'fieldtype': 'Select', - 'hidden': None, - 'icon': None, 'idx': 6, 'in_filter': 1, 'label': 'Group or Ledger', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00436', - 'no_column': None, - 'no_copy': None, 'oldfieldname': 'group_or_ledger', 'oldfieldtype': 'Select', 'options': '\nLedger\nGroup', - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', 'permlevel': 1, - 'print_hide': None, - 'report_hide': None, 'reqd': 1, - 'search_index': 1, - 'trigger': None, - 'width': None + 'search_index': 1 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2011-03-22 16:06:53', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', - 'fieldname': None, 'fieldtype': 'Button', - 'hidden': None, - 'icon': None, 'idx': 7, - 'in_filter': None, 'label': 'Convert to Group', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': '000001803', - 'no_column': None, - 'no_copy': None, - 'oldfieldname': None, - 'oldfieldtype': None, - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': None, - 'trigger': 'Client', - 'width': None + 'trigger': 'Client' }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2011-03-22 16:06:53', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', - 'fieldname': None, 'fieldtype': 'Button', - 'hidden': None, - 'icon': None, 'idx': 8, - 'in_filter': None, 'label': 'Convert to Ledger', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': '000001804', - 'no_column': None, - 'no_copy': None, - 'oldfieldname': None, - 'oldfieldtype': None, - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': None, - 'trigger': 'Client', - 'width': None + 'trigger': 'Client' }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'debit_or_credit', 'fieldtype': 'Data', - 'hidden': None, - 'icon': None, 'idx': 9, 'in_filter': 1, 'label': 'Debit or Credit', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00441', - 'no_column': None, - 'no_copy': None, 'oldfieldname': 'debit_or_credit', 'oldfieldtype': 'Data', - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', 'permlevel': 1, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': 1, - 'trigger': None, - 'width': None + 'search_index': 1 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'is_pl_account', 'fieldtype': 'Select', - 'hidden': None, - 'icon': None, 'idx': 10, 'in_filter': 1, 'label': 'Is PL Account', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00437', - 'no_column': None, - 'no_copy': None, 'oldfieldname': 'is_pl_account', 'oldfieldtype': 'Select', 'options': 'Yes\nNo', - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', 'permlevel': 1, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': 1, - 'trigger': None, - 'width': None + 'search_index': 1 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'account_type', 'fieldtype': 'Select', - 'hidden': None, - 'icon': None, 'idx': 11, 'in_filter': 1, 'label': 'Account Type', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00439', - 'no_column': None, - 'no_copy': None, 'oldfieldname': 'account_type', 'oldfieldtype': 'Select', 'options': '\nFixed Asset Account\nBank or Cash\nExpense Account\nTax\nIncome Account\nChargeable', - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, 'search_index': 0, - 'trigger': 'Client', - 'width': None + 'trigger': 'Client' }, + + # DocField { - 'allow_on_submit': None, 'colour': 'White:FFF', - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, 'description': 'If Account Type is "Tax" then the default rate is required.', - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'tax_rate', 'fieldtype': 'Currency', 'hidden': 0, - 'icon': None, 'idx': 12, - 'in_filter': None, 'label': 'Rate', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00440', - 'no_column': None, - 'no_copy': None, 'oldfieldname': 'tax_rate', 'oldfieldtype': 'Currency', - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': 0, - 'search_index': None, - 'trigger': None, - 'width': None + 'reqd': 0 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2011-06-23 17:11:38', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', - 'fieldname': None, 'fieldtype': 'Column Break', - 'hidden': None, - 'icon': None, 'idx': 13, - 'in_filter': None, - 'label': None, - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL05607', - 'no_column': None, - 'no_copy': None, - 'oldfieldname': None, - 'oldfieldtype': None, - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': None, - 'trigger': None, 'width': '50%' }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'freeze_account', 'fieldtype': 'Select', - 'hidden': None, - 'icon': None, 'idx': 14, - 'in_filter': None, 'label': 'Freeze Account', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00438', - 'no_column': None, - 'no_copy': None, 'oldfieldname': 'freeze_account', 'oldfieldtype': 'Select', 'options': 'No\nYes', - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', - 'permlevel': 2, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': None, - 'trigger': None, - 'width': None + 'permlevel': 2 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'company', 'fieldtype': 'Link', - 'hidden': None, - 'icon': None, 'idx': 15, 'in_filter': 1, 'label': 'Company', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00442', - 'no_column': None, - 'no_copy': None, 'oldfieldname': 'company', 'oldfieldtype': 'Link', 'options': 'Company', - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', 'permlevel': 1, - 'print_hide': None, - 'report_hide': None, 'reqd': 1, - 'search_index': 1, - 'trigger': None, - 'width': None + 'search_index': 1 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'credit_days', 'fieldtype': 'Int', 'hidden': 0, - 'icon': None, 'idx': 16, - 'in_filter': None, 'label': 'Credit Days', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00443', - 'no_column': None, - 'no_copy': None, 'oldfieldname': 'credit_days', 'oldfieldtype': 'Int', - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', 'permlevel': 0, - 'print_hide': 1, - 'report_hide': None, - 'reqd': None, - 'search_index': None, - 'trigger': None, - 'width': None + 'print_hide': 1 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'credit_limit', 'fieldtype': 'Currency', 'hidden': 0, - 'icon': None, 'idx': 17, - 'in_filter': None, 'label': 'Credit Limit', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00444', - 'no_column': None, - 'no_copy': None, 'oldfieldname': 'credit_limit', 'oldfieldtype': 'Currency', - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', 'permlevel': 0, - 'print_hide': 1, - 'report_hide': None, - 'reqd': None, - 'search_index': None, - 'trigger': None, - 'width': None + 'print_hide': 1 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'master_type', 'fieldtype': 'Select', - 'hidden': None, - 'icon': None, 'idx': 18, - 'in_filter': None, 'label': 'Master Type', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00453', - 'no_column': None, - 'no_copy': None, 'oldfieldname': 'master_type', 'oldfieldtype': 'Select', 'options': '\nNA\nSupplier\nCustomer\nEmployee', - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', - 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': None, - 'trigger': None, - 'width': None + 'permlevel': 0 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'master_name', 'fieldtype': 'Link', - 'hidden': None, - 'icon': None, 'idx': 19, - 'in_filter': None, 'label': 'Master Name', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00454', - 'no_column': None, - 'no_copy': None, 'oldfieldname': 'master_name', 'oldfieldtype': 'Link', - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': None, - 'trigger': 'Client', - 'width': None + 'trigger': 'Client' }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2011-06-23 17:11:38', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', - 'fieldname': None, 'fieldtype': 'Section Break', - 'hidden': None, - 'icon': None, 'idx': 20, - 'in_filter': None, 'label': 'TDS', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL05608', - 'no_column': None, - 'no_copy': None, - 'oldfieldname': None, 'oldfieldtype': 'Section Break', - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', - 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': None, - 'trigger': None, - 'width': None + 'permlevel': 0 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'pan_number', 'fieldtype': 'Data', - 'hidden': None, - 'icon': None, 'idx': 21, - 'in_filter': None, 'label': 'PAN Number', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00451', - 'no_column': None, - 'no_copy': None, 'oldfieldname': 'pan_number', 'oldfieldtype': 'Data', - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', - 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': None, - 'trigger': None, - 'width': None + 'permlevel': 0 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', 'default': 'No', - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'tds_applicable', 'fieldtype': 'Select', - 'hidden': None, - 'icon': None, 'idx': 22, - 'in_filter': None, 'label': 'TDS Applicable', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00452', - 'no_column': None, - 'no_copy': None, 'oldfieldname': 'tds_applicable', 'oldfieldtype': 'Select', 'options': '\nYes\nNo', - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', - 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': None, - 'trigger': None, - 'width': None + 'permlevel': 0 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'tds_details', 'fieldtype': 'Table', - 'hidden': None, - 'icon': None, 'idx': 23, - 'in_filter': None, 'label': 'TDS Details', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00456', - 'no_column': None, - 'no_copy': None, 'oldfieldname': 'tds_details', 'oldfieldtype': 'Table', 'options': 'TDS Detail', - 'owner': 'wasim@webnotestech.com', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', - 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': None, - 'trigger': None, - 'width': None + 'permlevel': 0 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, 'description': "Don't delete this field at any cost", - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'old_parent', 'fieldtype': 'Data', 'hidden': 1, - 'icon': None, 'idx': 24, - 'in_filter': None, 'label': 'Old Parent', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00447', - 'no_column': None, 'no_copy': 1, 'oldfieldname': 'old_parent', 'oldfieldtype': 'Data', - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', 'permlevel': 0, - 'print_hide': None, - 'report_hide': 1, - 'reqd': None, - 'search_index': None, - 'trigger': None, - 'width': None + 'report_hide': 1 }, + + # DocField { - 'allow_on_submit': None, 'colour': 'White:FFF', - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, 'description': "Don't delete this field at any cost", - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'lft', 'fieldtype': 'Int', 'hidden': 1, - 'icon': None, 'idx': 25, 'in_filter': 1, 'label': 'Lft', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00448', - 'no_column': None, 'no_copy': 1, 'oldfieldname': 'lft', 'oldfieldtype': 'Int', - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', 'permlevel': 3, 'print_hide': 1, 'report_hide': 1, - 'reqd': None, - 'search_index': 1, - 'trigger': None, - 'width': None + 'search_index': 1 }, + + # DocField { - 'allow_on_submit': None, 'colour': 'White:FFF', - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, 'description': "Don't delete this field at any cost", - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'rgt', 'fieldtype': 'Int', 'hidden': 1, - 'icon': None, 'idx': 26, 'in_filter': 1, 'label': 'Rgt', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00449', - 'no_column': None, 'no_copy': 1, 'oldfieldname': 'rgt', 'oldfieldtype': 'Int', - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', 'permlevel': 3, 'print_hide': 1, 'report_hide': 1, - 'reqd': None, - 'search_index': 1, - 'trigger': None, - 'width': None + 'search_index': 1 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', - 'hidden': None, - 'icon': None, 'idx': 27, - 'in_filter': None, 'label': 'Trash Reason', - 'modified': '2011-06-23 17:11:38', - 'modified_by': 'Administrator', - 'name': 'FL00457', - 'no_column': None, - 'no_copy': None, 'oldfieldname': 'trash_reason', 'oldfieldtype': 'Small Text', - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account', - 'parentfield': 'fields', - 'parenttype': 'DocType', - 'permlevel': 1, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': None, - 'trigger': None, - 'width': None + 'permlevel': 1 } ] \ No newline at end of file diff --git a/accounts/doctype/account_balance/account_balance.txt b/accounts/doctype/account_balance/account_balance.txt index 437cfb791b..a53def25be 100644 --- a/accounts/doctype/account_balance/account_balance.txt +++ b/accounts/doctype/account_balance/account_balance.txt @@ -1,417 +1,207 @@ +# DocType, Account Balance [ + + # These values are common in all dictionaries { - '_last_update': None, - 'allow_attach': None, - 'allow_copy': None, - 'allow_email': None, - 'allow_print': None, - 'allow_rename': None, - 'allow_trash': None, - 'autoname': '_ACB.######', - 'change_log': None, - 'client_script': None, - 'client_script_core': None, - 'client_string': None, - 'colour': 'White:FFF', 'creation': '2010-08-08 17:08:51', - 'description': None, 'docstatus': 0, - 'doctype': 'DocType', - 'document_type': None, - 'dt_template': None, - 'hide_heading': None, - 'hide_toolbar': None, - 'idx': None, - 'in_create': None, - 'in_dialog': None, - 'is_transaction_doc': None, - 'issingle': None, - 'istable': 0, - 'max_attachments': None, - 'menu_index': None, - 'modified': '2011-03-23 12:37:39', + 'modified': '2011-03-24 14:43:15', 'modified_by': 'Administrator', + 'owner': 'Administrator' + }, + + # These values are common for all DocType + { + '_last_update': '1305714002', + 'autoname': '_ACB.######', + 'colour': 'White:FFF', + 'doctype': 'DocType', + 'istable': 0, 'module': 'Accounts', - 'name': 'Account Balance', - 'name_case': None, - 'owner': 'Administrator', - 'parent': None, - 'parent_node': None, - 'parentfield': None, - 'parenttype': None, - 'print_outline': None, - 'read_only': None, - 'read_only_onload': None, + 'name': '__common__', 'search_fields': 'account, period, fiscal_year, balance', 'section_style': 'Simple', - 'server_code': None, - 'server_code_compiled': None, - 'server_code_core': None, 'server_code_error': ' ', 'show_in_menu': 0, - 'smallicon': None, - 'use_template': None, 'version': 28 }, + + # These values are common for all DocField + { + 'doctype': 'DocField', + 'name': '__common__', + 'parent': 'Account Balance', + 'parentfield': 'fields', + 'parenttype': 'DocType', + 'permlevel': 0 + }, + + # These values are common for all DocPerm { 'amend': 0, 'cancel': 0, 'create': 0, - 'creation': '2011-05-09 10:50:48', - 'docstatus': 0, 'doctype': 'DocPerm', - 'execute': None, - 'idx': None, - 'match': None, - 'modified': '2011-05-09 10:50:48', - 'modified_by': 'Administrator', - 'name': '000000174', - 'owner': 'Administrator', + 'name': '__common__', 'parent': 'Account Balance', 'parentfield': 'permissions', 'parenttype': 'DocType', - 'permlevel': None, + 'permlevel': 0, 'read': 1, - 'role': 'Accounts User', 'submit': 0, 'write': 0 }, + + # DocType, Account Balance + { + 'doctype': 'DocType', + 'name': 'Account Balance' + }, + + # DocPerm { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'creation': '2011-05-09 10:50:48', - 'docstatus': 0, 'doctype': 'DocPerm', - 'execute': None, - 'idx': None, - 'match': None, - 'modified': '2011-05-09 10:50:48', - 'modified_by': 'Administrator', - 'name': '000000175', - 'owner': 'Administrator', - 'parent': 'Account Balance', - 'parentfield': 'permissions', - 'parenttype': 'DocType', - 'permlevel': None, - 'read': 1, - 'role': 'Accounts Manager', - 'submit': 0, - 'write': 0 + 'role': 'Accounts User' }, + + # DocPerm + { + 'doctype': 'DocPerm', + 'role': 'Accounts Manager' + }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2011-05-09 10:50:48', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'account', 'fieldtype': 'Link', - 'hidden': None, - 'icon': None, 'idx': 1, 'in_filter': 1, 'label': 'Account', - 'modified': '2011-05-09 10:50:48', - 'modified_by': 'Administrator', - 'name': '000000176', - 'no_copy': None, - 'oldfieldname': None, - 'oldfieldtype': None, 'options': 'Account', - 'owner': 'Administrator', - 'parent': 'Account Balance', - 'parentfield': 'fields', - 'parenttype': 'DocType', - 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': 1, - 'trigger': None, - 'width': None + 'search_index': 1 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'period', 'fieldtype': 'Link', - 'hidden': None, - 'icon': None, 'idx': 2, 'in_filter': 1, 'label': 'Period', - 'modified': '2011-05-09 10:50:48', - 'modified_by': 'Administrator', - 'name': 'FL00458', - 'no_copy': None, 'oldfieldname': 'period', 'oldfieldtype': 'Link', 'options': 'Period', - 'owner': 'nabin@webnotestech.com', - 'parent': 'Account Balance', - 'parentfield': 'fields', - 'parenttype': 'DocType', - 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': 1, - 'trigger': None, - 'width': None + 'search_index': 1 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'opening', 'fieldtype': 'Currency', - 'hidden': None, - 'icon': None, - 'idx': 3, - 'in_filter': None, + 'idx': 4, 'label': 'Opening', - 'modified': '2011-05-09 10:50:48', - 'modified_by': 'Administrator', - 'name': 'FL00462', - 'no_copy': None, 'oldfieldname': 'opening', - 'oldfieldtype': 'Currency', - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account Balance', - 'parentfield': 'fields', - 'parenttype': 'DocType', - 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': None, - 'trigger': None, - 'width': None + 'oldfieldtype': 'Currency' }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-10-26 09:43:49', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'debit', 'fieldtype': 'Currency', - 'hidden': None, - 'icon': None, - 'idx': 4, - 'in_filter': None, + 'idx': 6, 'label': 'Debit', - 'modified': '2011-05-09 10:50:48', - 'modified_by': 'Administrator', - 'name': 'FL04062', - 'no_copy': None, 'oldfieldname': 'debit', - 'oldfieldtype': 'Currency', - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account Balance', - 'parentfield': 'fields', - 'parenttype': 'DocType', - 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': None, - 'trigger': None, - 'width': None + 'oldfieldtype': 'Currency' }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'debit', + 'fieldtype': 'Currency', + 'idx': 6, + 'label': 'Debit', + 'oldfieldname': 'debit', + 'oldfieldtype': 'Currency' + }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-10-26 09:43:49', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'credit', 'fieldtype': 'Currency', - 'hidden': None, - 'icon': None, - 'idx': 5, - 'in_filter': None, + 'idx': 7, 'label': 'Credit', - 'modified': '2011-05-09 10:50:48', - 'modified_by': 'Administrator', - 'name': 'FL04063', - 'no_copy': None, 'oldfieldname': 'credit', - 'oldfieldtype': 'Currency', - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account Balance', - 'parentfield': 'fields', - 'parenttype': 'DocType', - 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': None, - 'trigger': None, - 'width': None + 'oldfieldtype': 'Currency' }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'credit', + 'fieldtype': 'Currency', + 'idx': 7, + 'label': 'Credit', + 'oldfieldname': 'credit', + 'oldfieldtype': 'Currency' + }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'balance', 'fieldtype': 'Currency', - 'hidden': None, - 'icon': None, - 'idx': 6, - 'in_filter': None, + 'idx': 8, 'label': 'Balance', - 'modified': '2011-05-09 10:50:48', - 'modified_by': 'Administrator', - 'name': 'FL00463', - 'no_copy': None, 'oldfieldname': 'balance', - 'oldfieldtype': 'Currency', - 'options': None, - 'owner': 'Administrator', - 'parent': 'Account Balance', - 'parentfield': 'fields', - 'parenttype': 'DocType', - 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': None, - 'trigger': None, - 'width': None + 'oldfieldtype': 'Currency' }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'fiscal_year', 'fieldtype': 'Link', 'hidden': 1, - 'icon': None, - 'idx': 7, + 'idx': 9, 'in_filter': 1, 'label': 'Fiscal Year', - 'modified': '2011-05-09 10:50:48', - 'modified_by': 'Administrator', - 'name': 'FL00459', - 'no_copy': None, 'oldfieldname': 'fiscal_year', 'oldfieldtype': 'Link', 'options': 'Fiscal Year', - 'owner': 'Administrator', - 'parent': 'Account Balance', - 'parentfield': 'fields', - 'parenttype': 'DocType', - 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': 1, - 'trigger': None, - 'width': None + 'search_index': 1 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'start_date', 'fieldtype': 'Date', 'hidden': 1, - 'icon': None, - 'idx': 8, - 'in_filter': None, + 'idx': 10, + 'in_filter': 1, 'label': 'Start Date', - 'modified': '2011-05-09 10:50:48', - 'modified_by': 'Administrator', - 'name': 'FL00460', - 'no_copy': None, 'oldfieldname': 'start_date', 'oldfieldtype': 'Date', - 'options': None, - 'owner': 'nabin@webnotestech.com', - 'parent': 'Account Balance', - 'parentfield': 'fields', - 'parenttype': 'DocType', - 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': 1, - 'trigger': None, - 'width': None + 'search_index': 1 }, + + # DocField { - 'allow_on_submit': None, - 'colour': None, - 'creation': '2010-08-08 17:08:51', - 'default': None, - 'depends_on': None, - 'description': None, - 'docstatus': 0, 'doctype': 'DocField', 'fieldname': 'end_date', 'fieldtype': 'Date', 'hidden': 1, - 'icon': None, - 'idx': 9, - 'in_filter': None, + 'idx': 11, + 'in_filter': 1, 'label': 'End Date', - 'modified': '2011-05-09 10:50:48', - 'modified_by': 'Administrator', - 'name': 'FL00461', - 'no_copy': None, 'oldfieldname': 'end_date', 'oldfieldtype': 'Date', - 'options': None, - 'owner': 'nabin@webnotestech.com', - 'parent': 'Account Balance', - 'parentfield': 'fields', - 'parenttype': 'DocType', - 'permlevel': 0, - 'print_hide': None, - 'report_hide': None, - 'reqd': None, - 'search_index': 1, - 'trigger': None, - 'width': None + 'search_index': 1 } ] \ No newline at end of file diff --git a/accounts/doctype/accounts_setup/accounts_setup.js b/accounts/doctype/accounts_setup/accounts_setup.js deleted file mode 100644 index 61fd374add..0000000000 --- a/accounts/doctype/accounts_setup/accounts_setup.js +++ /dev/null @@ -1,3 +0,0 @@ -cur_frm.cscript['Repost GL'] = function(doc,dt,dn) { - $c_obj('GL Control','repost_gl','',function(r,rt) {alert('Done')}); -} \ No newline at end of file diff --git a/accounts/doctype/accounts_setup/accounts_setup.py b/accounts/doctype/accounts_setup/accounts_setup.py deleted file mode 100644 index 9e3ea6295d..0000000000 --- a/accounts/doctype/accounts_setup/accounts_setup.py +++ /dev/null @@ -1,43 +0,0 @@ -# Please edit this list and import only required elements -import webnotes - -from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add -from webnotes.model import db_exists -from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType -from webnotes.model.doclist import getlist, copy_doclist -from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax -from webnotes import session, form, is_testing, msgprint, errprint - -set = webnotes.conn.set -sql = webnotes.conn.sql -get_value = webnotes.conn.get_value -in_transaction = webnotes.conn.in_transaction -convert_to_lists = webnotes.conn.convert_to_lists - -# ----------------------------------------------------------------------------------------- - - -class DocType: - def __init__(self, d, dl): - self.doc, self.doclist = d, dl - - def get_bal(self,arg): - msgprint(arg) - bal = sql("select balance,debit_or_credit from tabAccount where name=%s", arg) - msgprint(bal) - return fmt_money(flt(bal[0][0])) + ' ' + bal[0][1] - - def on_update(self): - set_default('fiscal_year', self.doc.current_fiscal_year) - ysd = sql("select year_start_date from `tabFiscal Year` where name=%s", self.doc.current_fiscal_year)[0][0] - set_default('year_start_date', ysd.strftime('%Y-%m-%d')) - set_default('year_end_date', get_last_day(get_first_day(ysd,0,11)).strftime('%Y-%m-%d')) - - def get_bank_defaults(self, arg): - return { - 'def_bv_type': self.doc.default_bank_voucher_type, - 'def_bv_series': self.doc.default_bank_voucher_series, - 'def_bank_account': self.doc.default_bank_account, - 'bank_balance': self.get_bal(self.doc.default_bank_account), - 'acc_balance': self.get_bal(arg), - } \ No newline at end of file diff --git a/accounts/doctype/accounts_setup/accounts_setup.txt b/accounts/doctype/accounts_setup/accounts_setup.txt deleted file mode 100644 index 8beeac4fe1..0000000000 --- a/accounts/doctype/accounts_setup/accounts_setup.txt +++ /dev/null @@ -1 +0,0 @@ -[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-12 12:35:16', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': 1, 'dt_template': '
\n\nCurrent Fiscal Year is

\n\nB/S Difference is

\n\n1. Manage the Chart of Accounts

\n\n2. Close Fiscal Year
Message


\n\n3. Start A New Fiscal Year\n


\n\n4. Change Fiscal Year
- Change

\n\n5. Set Series
\n- Journal Voucher
\n- Expense Voucher (Bill)
\n- Invoice
\n\n
\n', 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 1, 'menu_index': None, 'docstatus': 0, 'allow_copy': 1, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': 1, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': 0, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Accounts Setup', 'idx': None, 'hide_toolbar': 0, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': '
', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 12:35:16', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Current Fiscal Year', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Accounts Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01323', 'idx': 1, 'default': None, 'colour': None, 'modified': '2009-06-11 19:29:54', 'parenttype': 'DocType', 'fieldname': 'current_fiscal_year', 'fieldtype': 'Link', 'options': 'Fiscal Year', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 12:35:16', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Default Bank Account', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Accounts Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01324', 'idx': 2, 'default': None, 'colour': None, 'modified': '2009-06-11 19:29:54', 'parenttype': 'DocType', 'fieldname': 'default_bank_account', 'fieldtype': 'Link', 'options': 'Account', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 12:35:16', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Default Bank Voucher Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Accounts Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01325', 'idx': 3, 'default': None, 'colour': None, 'modified': '2009-06-11 19:29:54', 'parenttype': 'DocType', 'fieldname': 'default_bank_voucher_type', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 12:35:16', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Default Bank Voucher Series', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Accounts Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01326', 'idx': 4, 'default': None, 'colour': None, 'modified': '2009-06-11 19:29:54', 'parenttype': 'DocType', 'fieldname': 'default_bank_voucher_series', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 12:35:16', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Repost GL', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Accounts Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01327', 'idx': 5, 'default': None, 'colour': None, 'modified': '2009-06-11 19:29:54', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/accounts/doctype/advance_adjustment_detail/advance_adjustment_detail.txt b/accounts/doctype/advance_adjustment_detail/advance_adjustment_detail.txt
index de5e28353c..a3a63c9be2 100644
--- a/accounts/doctype/advance_adjustment_detail/advance_adjustment_detail.txt
+++ b/accounts/doctype/advance_adjustment_detail/advance_adjustment_detail.txt
@@ -1 +1,110 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-05-22 14:56:16', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 24, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'nabin@webnotestech.com', 'document_type': None, 'name': 'Advance Adjustment Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': 1, 'oldfieldtype': 'Link', 'creation': '2009-05-22 14:56:16', 'doctype': 'DocField', 'oldfieldname': 'journal_voucher', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Journal Voucher', 'width': '250px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Advance Adjustment Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02126', 'idx': 1, 'default': None, 'colour': None, 'modified': '2009-12-15 14:34:41', 'parenttype': 'DocType', 'fieldname': 'journal_voucher', 'fieldtype': 'Link', 'options': 'Journal Voucher', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2009-05-28 12:21:27', 'doctype': 'DocField', 'oldfieldname': 'jv_detail_no', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Journal Voucher Detail No', 'width': '120px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Advance Adjustment Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02226', 'idx': 2, 'default': None, 'colour': None, 'modified': '2009-12-15 14:34:41', 'parenttype': 'DocType', 'fieldname': 'jv_detail_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Currency', 'creation': '2009-05-22 14:56:16', 'doctype': 'DocField', 'oldfieldname': 'advance_amount', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Advance amount', 'width': '120px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Advance Adjustment Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02127', 'idx': 3, 'default': None, 'colour': None, 'modified': '2009-12-15 14:34:41', 'parenttype': 'DocType', 'fieldname': 'advance_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Currency', 'creation': '2009-05-28 12:22:02', 'doctype': 'DocField', 'oldfieldname': 'allocated_amount', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Allocated amount', 'width': '120px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Advance Adjustment Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02227', 'idx': 4, 'default': None, 'colour': None, 'modified': '2009-12-15 14:34:41', 'parenttype': 'DocType', 'fieldname': 'allocated_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Small Text', 'creation': '2009-05-28 14:19:30', 'doctype': 'DocField', 'oldfieldname': 'remarks', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Remarks', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Advance Adjustment Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02231', 'idx': 5, 'default': None, 'colour': None, 'modified': '2009-12-15 14:34:41', 'parenttype': 'DocType', 'fieldname': 'remarks', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Advance Adjustment Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 24
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'no_copy': 1,
+		'parent': 'Advance Adjustment Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Advance Adjustment Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Advance Adjustment Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'journal_voucher',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Journal Voucher',
+		'oldfieldname': 'journal_voucher',
+		'oldfieldtype': 'Link',
+		'options': 'Journal Voucher',
+		'permlevel': 1,
+		'width': '250px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'jv_detail_no',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 2,
+		'label': 'Journal Voucher Detail No',
+		'oldfieldname': 'jv_detail_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '120px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'advance_amount',
+		'fieldtype': 'Currency',
+		'idx': 3,
+		'label': 'Advance amount',
+		'oldfieldname': 'advance_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'width': '120px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'allocated_amount',
+		'fieldtype': 'Currency',
+		'idx': 4,
+		'label': 'Allocated amount',
+		'oldfieldname': 'allocated_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'trigger': 'Client',
+		'width': '120px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'remarks',
+		'fieldtype': 'Small Text',
+		'idx': 5,
+		'label': 'Remarks',
+		'oldfieldname': 'remarks',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1,
+		'width': '150px'
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/advance_allocation_detail/advance_allocation_detail.txt b/accounts/doctype/advance_allocation_detail/advance_allocation_detail.txt
index 532f8010b6..5bb5d38fca 100644
--- a/accounts/doctype/advance_allocation_detail/advance_allocation_detail.txt
+++ b/accounts/doctype/advance_allocation_detail/advance_allocation_detail.txt
@@ -1 +1,141 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-06-11 13:16:20', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 20, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'nabin@webnotestech.com', 'document_type': None, 'name': 'Advance Allocation Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': 1, 'oldfieldtype': 'Link', 'creation': '2009-06-11 13:16:20', 'doctype': 'DocField', 'oldfieldname': 'journal_voucher', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Journal Voucher', 'width': '180px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Advance Allocation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02297', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-04-15 16:54:44', 'parenttype': 'DocType', 'fieldname': 'journal_voucher', 'fieldtype': 'Link', 'options': 'Journal Voucher', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Date', 'creation': '2009-06-11 13:16:20', 'doctype': 'DocField', 'oldfieldname': 'jv_detail_no', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Journal Voucher Detail No', 'width': '80px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Advance Allocation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02298', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-04-15 16:54:44', 'parenttype': 'DocType', 'fieldname': 'jv_detail_no', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Currency', 'creation': '2009-06-11 13:16:20', 'doctype': 'DocField', 'oldfieldname': 'advance_amount', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Advance Amount', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Advance Allocation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02300', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-04-15 16:54:44', 'parenttype': 'DocType', 'fieldname': 'advance_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Currency', 'creation': '2009-06-11 13:16:20', 'doctype': 'DocField', 'oldfieldname': 'allocated_amount', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Allocated Amount', 'width': '100px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Advance Allocation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02301', 'idx': 4, 'default': None, 'colour': 'White:FFF', 'modified': '2010-04-15 16:54:44', 'parenttype': 'DocType', 'fieldname': 'allocated_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-06-11 13:16:20', 'doctype': 'DocField', 'oldfieldname': 'tds_amount', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'TDS Amount', 'width': '80px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Advance Allocation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02302', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-04-15 16:54:44', 'parenttype': 'DocType', 'fieldname': 'tds_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-06-11 18:12:48', 'doctype': 'DocField', 'oldfieldname': 'tds_allocated', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'TDS Allocated', 'width': '80px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Advance Allocation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02305', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-04-15 16:54:44', 'parenttype': 'DocType', 'fieldname': 'tds_allocated', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Small Text', 'creation': '2009-06-11 13:16:20', 'doctype': 'DocField', 'oldfieldname': 'remarks', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Remarks', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Advance Allocation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02299', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-04-15 16:54:44', 'parenttype': 'DocType', 'fieldname': 'remarks', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Advance Allocation Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 20
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Advance Allocation Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Advance Allocation Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Advance Allocation Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'journal_voucher',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Journal Voucher',
+		'no_copy': 1,
+		'oldfieldname': 'journal_voucher',
+		'oldfieldtype': 'Link',
+		'options': 'Journal Voucher',
+		'permlevel': 1,
+		'width': '180px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'jv_detail_no',
+		'fieldtype': 'Date',
+		'hidden': 1,
+		'idx': 2,
+		'label': 'Journal Voucher Detail No',
+		'no_copy': 1,
+		'oldfieldname': 'jv_detail_no',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '80px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'advance_amount',
+		'fieldtype': 'Currency',
+		'idx': 3,
+		'label': 'Advance Amount',
+		'no_copy': 1,
+		'oldfieldname': 'advance_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'allocated_amount',
+		'fieldtype': 'Currency',
+		'idx': 4,
+		'label': 'Allocated Amount',
+		'no_copy': 1,
+		'oldfieldname': 'allocated_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tds_amount',
+		'fieldtype': 'Currency',
+		'idx': 5,
+		'label': 'TDS Amount',
+		'oldfieldname': 'tds_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'width': '80px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tds_allocated',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'label': 'TDS Allocated',
+		'oldfieldname': 'tds_allocated',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'width': '80px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'remarks',
+		'fieldtype': 'Small Text',
+		'idx': 7,
+		'label': 'Remarks',
+		'no_copy': 1,
+		'oldfieldname': 'remarks',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1,
+		'width': '150px'
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/bank_reconciliation/bank_reconciliation.txt b/accounts/doctype/bank_reconciliation/bank_reconciliation.txt
index 4b47fa782f..7dc5e5af95 100644
--- a/accounts/doctype/bank_reconciliation/bank_reconciliation.txt
+++ b/accounts/doctype/bank_reconciliation/bank_reconciliation.txt
@@ -1 +1,165 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-04-10 15:10:52', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': 1, 'allow_email': 1, 'dt_template': None, 'hide_heading': 1, 'issingle': 1, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 15, 'menu_index': None, 'docstatus': 0, 'allow_copy': 1, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': 1, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': '', 'name': 'Bank Reconciliation', 'idx': None, 'hide_toolbar': 1, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-23 13:53:32', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00274', 'parent': 'Bank Reconciliation', 'read': 1, 'create': 1, 'creation': '2009-04-10 15:10:52', 'modified': '2010-09-23 13:53:32', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Accounts User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': '', 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00275', 'parent': 'Bank Reconciliation', 'read': 1, 'create': None, 'creation': '2009-04-10 15:10:52', 'modified': '2010-09-23 13:53:32', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'All', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM01161', 'parent': 'Bank Reconciliation', 'read': 1, 'create': 1, 'creation': '2010-09-06 17:53:25', 'modified': '2010-09-23 13:53:32', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'Accounts Manager', 'owner': 'sneha@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-05-04 12:00:43', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'saumil@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Head HTML', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Bank Reconciliation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04972', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-23 13:53:32', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-04-10 15:10:52', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Bank Account', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Select account head of the bank where cheque was deposited.', 'parent': 'Bank Reconciliation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01770', 'idx': 2, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-23 13:53:32', 'parenttype': 'DocType', 'fieldname': 'bank_account', 'fieldtype': 'Link', 'options': 'Account', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-05-15 17:07:58', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'From Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Bank Reconciliation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02084', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-23 13:53:32', 'parenttype': 'DocType', 'fieldname': 'from_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-05-15 17:07:58', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'To Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Bank Reconciliation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02083', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-09-23 13:53:32', 'parenttype': 'DocType', 'fieldname': 'to_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-04-10 15:10:52', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Get Non Reconciled Entries', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Bank Reconciliation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01768', 'idx': 5, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-23 13:53:32', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'get_details', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-04-10 15:10:52', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Entries', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Bank Reconciliation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01771', 'idx': 6, 'default': '', 'colour': 'White:FFF', 'modified': '2010-09-23 13:53:32', 'parenttype': 'DocType', 'fieldname': 'entries', 'fieldtype': 'Table', 'options': 'Bank Reconciliation Detail', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-04-10 15:28:42', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Update Clearance Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Bank Reconciliation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01778', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-09-23 13:53:32', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'update_details', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-04-10 15:10:52', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Total Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Bank Reconciliation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01769', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-09-23 13:53:32', 'parenttype': 'DocType', 'fieldname': 'total_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Bank Reconciliation
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:52',
+		'docstatus': 0,
+		'modified': '2010-12-29 18:11:06',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1294312169',
+		'allow_copy': 1,
+		'allow_email': 1,
+		'allow_print': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'hide_heading': 1,
+		'hide_toolbar': 1,
+		'issingle': 1,
+		'module': 'Accounts',
+		'name': '__common__',
+		'read_only': 1,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 12
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Bank Reconciliation',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Bank Reconciliation',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Bank Reconciliation
+	{
+		'doctype': 'DocType',
+		'name': 'Bank Reconciliation'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'Accounts User',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'All'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 1,
+		'label': 'Head HTML',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'description': 'Select account head of the bank where cheque was deposited.',
+		'doctype': 'DocField',
+		'fieldname': 'bank_account',
+		'fieldtype': 'Link',
+		'idx': 2,
+		'label': 'Bank Account',
+		'options': 'Account',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'from_date',
+		'fieldtype': 'Date',
+		'idx': 3,
+		'label': 'From Date',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'to_date',
+		'fieldtype': 'Date',
+		'idx': 4,
+		'label': 'To Date',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 5,
+		'label': 'Get Non Reconciled Entries',
+		'options': 'get_details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'entries',
+		'fieldtype': 'Table',
+		'idx': 6,
+		'label': 'Entries',
+		'options': 'Bank Reconciliation Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 7,
+		'label': 'Update Clearance Date',
+		'options': 'update_details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'total_amount',
+		'fieldtype': 'Currency',
+		'idx': 8,
+		'label': 'Total Amount',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
index 203d98adce..4d1fb0c9b0 100644
--- a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
+++ b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
@@ -1 +1,113 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-04-10 15:13:36', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 5, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': '', 'name': 'Bank Reconciliation Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-23 13:57:17', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-04-10 15:13:36', 'doctype': 'DocField', 'oldfieldname': 'voucher_id', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Voucher ID', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Bank Reconciliation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01772', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-23 13:57:17', 'parenttype': 'DocType', 'fieldname': 'voucher_id', 'fieldtype': 'Link', 'options': 'Journal Voucher', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-05-15 17:03:23', 'doctype': 'DocField', 'oldfieldname': 'against_account', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Against Account', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Bank Reconciliation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02081', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-23 13:57:17', 'parenttype': 'DocType', 'fieldname': 'against_account', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2009-07-31 17:22:06', 'doctype': 'DocField', 'oldfieldname': 'posting_date', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Posting Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': 'The date at which current entry will get or has actually executed.', 'parent': 'Bank Reconciliation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02688', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-23 13:57:17', 'parenttype': 'DocType', 'fieldname': 'posting_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-04-10 15:13:36', 'doctype': 'DocField', 'oldfieldname': 'cheque_number', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Cheque Number', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Bank Reconciliation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01773', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-09-23 13:57:17', 'parenttype': 'DocType', 'fieldname': 'cheque_number', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2009-04-10 15:13:36', 'doctype': 'DocField', 'oldfieldname': 'cheque_date', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Cheque Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Bank Reconciliation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01774', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-09-23 13:57:17', 'parenttype': 'DocType', 'fieldname': 'cheque_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-04-10 15:13:36', 'doctype': 'DocField', 'oldfieldname': 'debit', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Debit', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Bank Reconciliation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01775', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-09-23 13:57:17', 'parenttype': 'DocType', 'fieldname': 'debit', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-04-10 15:13:36', 'doctype': 'DocField', 'oldfieldname': 'credit', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Credit', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Bank Reconciliation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01776', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-09-23 13:57:17', 'parenttype': 'DocType', 'fieldname': 'credit', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2009-04-10 15:13:36', 'doctype': 'DocField', 'oldfieldname': 'clearance_date', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Clearance Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Bank Reconciliation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01777', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-09-23 13:57:17', 'parenttype': 'DocType', 'fieldname': 'clearance_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Bank Reconciliation Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:52',
+		'docstatus': 0,
+		'modified': '2010-09-23 13:57:17',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'show_in_menu': 0,
+		'version': 4
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Bank Reconciliation Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Bank Reconciliation Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Bank Reconciliation Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'voucher_id',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Voucher ID',
+		'oldfieldname': 'voucher_id',
+		'oldfieldtype': 'Link',
+		'options': 'Journal Voucher',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'against_account',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Against Account',
+		'oldfieldname': 'against_account',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'description': 'The date at which current entry will get or has actually executed.',
+		'doctype': 'DocField',
+		'fieldname': 'posting_date',
+		'fieldtype': 'Date',
+		'idx': 3,
+		'label': 'Posting Date',
+		'oldfieldname': 'posting_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'cheque_number',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'Cheque Number',
+		'oldfieldname': 'cheque_number',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'cheque_date',
+		'fieldtype': 'Date',
+		'idx': 5,
+		'label': 'Cheque Date',
+		'oldfieldname': 'cheque_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'clearance_date',
+		'fieldtype': 'Date',
+		'idx': 8,
+		'label': 'Clearance Date',
+		'oldfieldname': 'clearance_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/budget_control/budget_control.txt b/accounts/doctype/budget_control/budget_control.txt
index babca755fe..4f84bd4763 100644
--- a/accounts/doctype/budget_control/budget_control.txt
+++ b/accounts/doctype/budget_control/budget_control.txt
@@ -1 +1,31 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-03-04 14:18:59', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'nabin@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 24, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'nabin@webnotestech.com', 'document_type': None, 'name': 'Budget Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
+# DocType, Budget Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:54',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'nabin@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 23
+	},
+
+	# DocType, Budget Control
+	{
+		'doctype': 'DocType',
+		'name': 'Budget Control'
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/budget_detail/budget_detail.txt b/accounts/doctype/budget_detail/budget_detail.txt
index 6c8bedb1a7..dafa391c28 100644
--- a/accounts/doctype/budget_detail/budget_detail.txt
+++ b/accounts/doctype/budget_detail/budget_detail.txt
@@ -1 +1,98 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-06-05 16:50:56', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 6, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'CBD/.######', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': None, 'name': 'Budget Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-06-05 16:50:56', 'doctype': 'DocField', 'oldfieldname': 'account', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Account', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Budget Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02268', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-07-28 13:18:00', 'parenttype': 'DocType', 'fieldname': 'account', 'fieldtype': 'Link', 'options': 'Account', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-06-05 16:50:56', 'doctype': 'DocField', 'oldfieldname': 'budget_allocated', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Budget Allocated', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Budget Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02269', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-07-28 13:18:00', 'parenttype': 'DocType', 'fieldname': 'budget_allocated', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-06-05 16:50:56', 'doctype': 'DocField', 'oldfieldname': 'actual', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Actual', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Budget Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02270', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-07-28 13:18:00', 'parenttype': 'DocType', 'fieldname': 'actual', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-06-05 16:50:56', 'doctype': 'DocField', 'oldfieldname': 'fiscal_year', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Fiscal Year', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Budget Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02272', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-07-28 13:18:00', 'parenttype': 'DocType', 'fieldname': 'fiscal_year', 'fieldtype': 'Select', 'options': 'link:Fiscal Year', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Budget Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:54',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'CBD/.######',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'show_in_menu': 0,
+		'version': 6
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Budget Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Budget Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Budget Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'account',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'in_filter': 1,
+		'label': 'Account',
+		'oldfieldname': 'account',
+		'oldfieldtype': 'Link',
+		'options': 'Account',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'budget_allocated',
+		'fieldtype': 'Currency',
+		'idx': 2,
+		'label': 'Budget Allocated',
+		'oldfieldname': 'budget_allocated',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'actual',
+		'fieldtype': 'Currency',
+		'idx': 3,
+		'label': 'Actual',
+		'oldfieldname': 'actual',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/budget_distribution/budget_distribution.txt b/accounts/doctype/budget_distribution/budget_distribution.txt
index 47e4b73676..5e224eeffc 100644
--- a/accounts/doctype/budget_distribution/budget_distribution.txt
+++ b/accounts/doctype/budget_distribution/budget_distribution.txt
@@ -1 +1,166 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-06-05 16:56:17', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 24, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:distribution_id', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': None, 'name': 'Budget Distribution', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': 'Title Case', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00309', 'parent': 'Budget Distribution', 'read': 1, 'create': 1, 'creation': '2009-06-05 16:56:17', 'modified': '2010-05-03 08:45:56', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00312', 'parent': 'Budget Distribution', 'read': 1, 'create': None, 'creation': '2009-06-09 17:48:11', 'modified': '2010-04-28 11:28:51', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00313', 'parent': 'Budget Distribution', 'read': 1, 'create': None, 'creation': '2009-06-09 17:48:11', 'modified': '2010-04-28 11:28:51', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 3, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 2, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': 0, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00552', 'parent': 'Budget Distribution', 'read': 1, 'create': 1, 'creation': '2009-12-31 12:10:55', 'modified': '2010-05-03 08:45:56', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 4, 'parenttype': 'DocType', 'role': 'Accounts Manager', 'owner': 'saumil@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00553', 'parent': 'Budget Distribution', 'read': 1, 'create': 0, 'creation': '2009-12-31 12:10:55', 'modified': '2010-04-28 11:28:51', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 5, 'parenttype': 'DocType', 'role': 'Accounts Manager', 'owner': 'saumil@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00554', 'parent': 'Budget Distribution', 'read': 1, 'create': None, 'creation': '2009-12-31 12:10:55', 'modified': '2010-04-28 11:28:51', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 6, 'parenttype': 'DocType', 'role': 'Accounts Manager', 'owner': 'saumil@webnotestech.com', 'docstatus': 0, 'permlevel': 2, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-06-05 16:56:17', 'doctype': 'DocField', 'oldfieldname': 'distribution_id', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Distribution ID', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Budget Distribution', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02273', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-04-28 11:28:51', 'parenttype': 'DocType', 'fieldname': 'distribution_id', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-06-05 16:56:17', 'doctype': 'DocField', 'oldfieldname': 'fiscal_year', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Fiscal Year', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Budget Distribution', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02274', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-04-28 11:28:51', 'parenttype': 'DocType', 'fieldname': 'fiscal_year', 'fieldtype': 'Select', 'options': 'link:Fiscal Year', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Table', 'creation': '2009-06-05 16:56:17', 'doctype': 'DocField', 'oldfieldname': 'budget_distribution_details', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Budget Distribution Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Budget Distribution', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02275', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-04-28 11:28:51', 'parenttype': 'DocType', 'fieldname': 'budget_distribution_details', 'fieldtype': 'Table', 'options': 'Budget Distribution Detail', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Budget Distribution', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04829', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-04-28 11:28:51', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Budget Distribution
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:54',
+		'docstatus': 0,
+		'modified': '2010-12-29 18:20:37',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:distribution_id',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'Accounts',
+		'name': '__common__',
+		'name_case': 'Title Case',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 24
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Budget Distribution',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Budget Distribution',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Budget Distribution
+	{
+		'doctype': 'DocType',
+		'name': 'Budget Distribution'
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 2,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Accounts Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 1,
+		'role': 'Accounts Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 2,
+		'role': 'Accounts Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'distribution_id',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Distribution ID',
+		'oldfieldname': 'distribution_id',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'budget_distribution_details',
+		'fieldtype': 'Table',
+		'idx': 3,
+		'label': 'Budget Distribution Details',
+		'oldfieldname': 'budget_distribution_details',
+		'oldfieldtype': 'Table',
+		'options': 'Budget Distribution Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 4,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt b/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
index 98966e07e4..cc872a9596 100644
--- a/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
+++ b/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
@@ -1 +1,78 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-06-05 17:42:48', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 6, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'BDD/.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Budget Distribution Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-06-05 17:42:48', 'doctype': 'DocField', 'oldfieldname': 'month', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Month', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 2, 'description': None, 'parent': 'Budget Distribution Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02276', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-03-19 15:53:59', 'parenttype': 'DocType', 'fieldname': 'month', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-06-05 17:42:48', 'doctype': 'DocField', 'oldfieldname': 'percentage_allocation', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Percentage Allocation', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Budget Distribution Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02277', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-03-19 15:53:59', 'parenttype': 'DocType', 'fieldname': 'percentage_allocation', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-06-09 15:31:58', 'doctype': 'DocField', 'oldfieldname': 'aggregate_percentage', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Aggregate Percentage', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 2, 'description': None, 'parent': 'Budget Distribution Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02290', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-03-19 15:53:59', 'parenttype': 'DocType', 'fieldname': 'aggregate_percentage', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Budget Distribution Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:54',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'BDD/.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 6
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Budget Distribution Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Budget Distribution Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Budget Distribution Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'month',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Month',
+		'oldfieldname': 'month',
+		'oldfieldtype': 'Data',
+		'permlevel': 2,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'percentage_allocation',
+		'fieldtype': 'Currency',
+		'idx': 2,
+		'label': 'Percentage Allocation',
+		'oldfieldname': 'percentage_allocation',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'aggregate_percentage',
+		'fieldtype': 'Currency',
+		'idx': 3,
+		'label': 'Aggregate Percentage',
+		'oldfieldname': 'aggregate_percentage',
+		'oldfieldtype': 'Currency',
+		'permlevel': 2
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/cost_center/cost_center.txt b/accounts/doctype/cost_center/cost_center.txt
index 6aeaf50f23..ce39929003 100644
--- a/accounts/doctype/cost_center/cost_center.txt
+++ b/accounts/doctype/cost_center/cost_center.txt
@@ -1 +1,298 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-12 12:09:19', 'search_fields': 'name,parent_cost_center', 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 1, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 108, 'menu_index': None, 'docstatus': 0, 'allow_copy': 1, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:cost_center_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'nabin@webnotestech.com', 'document_type': 'Master', 'name': 'Cost Center', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-11-30 18:18:39', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM00852', 'parent': 'Cost Center', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:27:45', 'modified': '2010-11-30 18:18:39', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 1, 'parenttype': 'DocType', 'role': 'Accounts Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': 0, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM00853', 'parent': 'Cost Center', 'read': 1, 'create': 1, 'creation': '2010-04-26 16:27:45', 'modified': '2010-11-30 18:18:39', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'Accounts Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM00862', 'parent': 'Cost Center', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:47:40', 'modified': '2010-11-30 18:18:39', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 3, 'parenttype': 'DocType', 'role': 'Accounts User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM00151', 'parent': 'Cost Center', 'read': 1, 'create': 0, 'creation': '2009-03-12 14:05:37', 'modified': '2010-11-30 18:18:39', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 4, 'parenttype': 'DocType', 'role': 'Accounts User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': '', 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM00310', 'parent': 'Cost Center', 'read': 1, 'create': 1, 'creation': '2009-06-08 11:37:06', 'modified': '2010-11-30 18:18:39', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 5, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM00311', 'parent': 'Cost Center', 'read': 1, 'create': None, 'creation': '2009-06-08 11:37:06', 'modified': '2010-11-30 18:18:39', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 6, 'parenttype': 'DocType', 'role': 'All', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Cost Center', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04835', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-11-30 18:18:39', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:19', 'doctype': 'DocField', 'oldfieldname': 'cost_center_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 0, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Cost Center Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Cost Center', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL00338', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-11-30 18:18:39', 'parenttype': 'DocType', 'fieldname': 'cost_center_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:09:19', 'doctype': 'DocField', 'oldfieldname': 'parent_cost_center', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Parent Cost Center', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Select company name first.', 'parent': 'Cost Center', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00339', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-11-30 18:18:39', 'parenttype': 'DocType', 'fieldname': 'parent_cost_center', 'fieldtype': 'Link', 'options': 'Cost Center', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-06-08 10:49:36', 'doctype': 'DocField', 'oldfieldname': 'company_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Company', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Cost Center', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02281', 'idx': 4, 'default': None, 'colour': 'White:FFF', 'modified': '2010-11-30 18:18:39', 'parenttype': 'DocType', 'fieldname': 'company_name', 'fieldtype': 'Link', 'options': 'Company', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-06-08 10:49:36', 'doctype': 'DocField', 'oldfieldname': 'company_abbr', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Company Abbr', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Cost Center', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02280', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-11-30 18:18:39', 'parenttype': 'DocType', 'fieldname': 'company_abbr', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Select', 'creation': '2009-08-10 17:03:04', 'doctype': 'DocField', 'oldfieldname': 'group_or_ledger', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Group or Ledger', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Cost Center', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02706', 'idx': 6, 'default': None, 'colour': 'White:FFF', 'modified': '2010-11-30 18:18:39', 'parenttype': 'DocType', 'fieldname': 'group_or_ledger', 'fieldtype': 'Select', 'options': '\nGroup\nLedger', 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-07-28 13:17:53', 'doctype': 'DocField', 'oldfieldname': 'distribution_id', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Distribution Id', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Cost Center', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05721', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-11-30 18:18:39', 'parenttype': 'DocType', 'fieldname': 'distribution_id', 'fieldtype': 'Link', 'options': 'Budget Distribution', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Table', 'creation': '2009-06-05 16:46:56', 'doctype': 'DocField', 'oldfieldname': 'budget_details', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Budget Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Cost Center', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02267', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-11-30 18:18:39', 'parenttype': 'DocType', 'fieldname': 'budget_details', 'fieldtype': 'Table', 'options': 'Budget Detail', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Int', 'creation': '2009-03-12 12:09:19', 'doctype': 'DocField', 'oldfieldname': 'lft', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'lft', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Cost Center', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL00343', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-11-30 18:18:39', 'parenttype': 'DocType', 'fieldname': 'lft', 'fieldtype': 'Int', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Int', 'creation': '2009-03-12 12:09:19', 'doctype': 'DocField', 'oldfieldname': 'rgt', 'owner': 'Administrator', 'reqd': 0, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'rgt', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Cost Center', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL00344', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-11-30 18:18:39', 'parenttype': 'DocType', 'fieldname': 'rgt', 'fieldtype': 'Int', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:19', 'doctype': 'DocField', 'oldfieldname': 'old_parent', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'old_parent', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Cost Center', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00345', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-11-30 18:18:39', 'parenttype': 'DocType', 'fieldname': 'old_parent', 'fieldtype': 'Data', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Cost Center
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:56',
+		'docstatus': 0,
+		'modified': '2010-12-29 18:18:55',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308741898',
+		'allow_copy': 1,
+		'allow_trash': 1,
+		'autoname': 'field:cost_center_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'in_create': 1,
+		'module': 'Accounts',
+		'name': '__common__',
+		'search_fields': 'name,parent_cost_center',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 104
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Cost Center',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Cost Center',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Cost Center
+	{
+		'doctype': 'DocType',
+		'name': 'Cost Center'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Accounts Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Accounts Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Accounts User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Accounts User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'All'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'cost_center_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'in_filter': 0,
+		'label': 'Cost Center Name',
+		'no_copy': 1,
+		'oldfieldname': 'cost_center_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'description': 'Select company name first.',
+		'doctype': 'DocField',
+		'fieldname': 'parent_cost_center',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'label': 'Parent Cost Center',
+		'oldfieldname': 'parent_cost_center',
+		'oldfieldtype': 'Link',
+		'options': 'Cost Center',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'company_name',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'label': 'Company',
+		'oldfieldname': 'company_name',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company_abbr',
+		'fieldtype': 'Data',
+		'idx': 5,
+		'label': 'Company Abbr',
+		'oldfieldname': 'company_abbr',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'group_or_ledger',
+		'fieldtype': 'Select',
+		'hidden': 1,
+		'idx': 6,
+		'label': 'Group or Ledger',
+		'no_copy': 1,
+		'oldfieldname': 'group_or_ledger',
+		'oldfieldtype': 'Select',
+		'options': '\nGroup\nLedger',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'distribution_id',
+		'fieldtype': 'Link',
+		'idx': 7,
+		'label': 'Distribution Id',
+		'oldfieldname': 'distribution_id',
+		'oldfieldtype': 'Link',
+		'options': 'Budget Distribution',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'budget_details',
+		'fieldtype': 'Table',
+		'idx': 8,
+		'label': 'Budget Details',
+		'oldfieldname': 'budget_details',
+		'oldfieldtype': 'Table',
+		'options': 'Budget Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'lft',
+		'fieldtype': 'Int',
+		'hidden': 1,
+		'idx': 9,
+		'in_filter': 1,
+		'label': 'lft',
+		'no_copy': 1,
+		'oldfieldname': 'lft',
+		'oldfieldtype': 'Int',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rgt',
+		'fieldtype': 'Int',
+		'hidden': 1,
+		'idx': 10,
+		'in_filter': 1,
+		'label': 'rgt',
+		'no_copy': 1,
+		'oldfieldname': 'rgt',
+		'oldfieldtype': 'Int',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1,
+		'reqd': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'old_parent',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 11,
+		'label': 'old_parent',
+		'no_copy': 1,
+		'oldfieldname': 'old_parent',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/fiscal_year/fiscal_year.txt b/accounts/doctype/fiscal_year/fiscal_year.txt
index 144b5d181d..fe02b34310 100644
--- a/accounts/doctype/fiscal_year/fiscal_year.txt
+++ b/accounts/doctype/fiscal_year/fiscal_year.txt
@@ -1 +1,209 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-03-12 12:04:09', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 8, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:year', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': 'Master', 'name': 'Fiscal Year', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-11-04 15:31:05', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 1, 'amend': 0, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00150', 'parent': 'Fiscal Year', 'read': 1, 'create': 1, 'creation': '2009-03-12 14:03:39', 'modified': '2010-11-04 15:31:05', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'System Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': '', 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00026', 'parent': 'Fiscal Year', 'read': 1, 'create': 1, 'creation': '2009-03-12 12:04:09', 'modified': '2010-11-04 15:31:05', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-07-31 12:54:14', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Year Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Fiscal Year', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05771', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-11-04 15:31:05', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Fiscal Year', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04845', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-11-04 15:31:05', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:04:09', 'doctype': 'DocField', 'oldfieldname': 'year', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Year Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Fiscal Year', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00270', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-11-04 15:31:05', 'parenttype': 'DocType', 'fieldname': 'year', 'fieldtype': 'Data', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-06-15 14:24:01', 'doctype': 'DocField', 'oldfieldname': 'abbreviation', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Abbreviation', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Fiscal Year', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02336', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-11-04 15:31:05', 'parenttype': 'DocType', 'fieldname': 'abbreviation', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2009-03-12 12:04:09', 'doctype': 'DocField', 'oldfieldname': 'year_start_date', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Year Start Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Fiscal Year', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00271', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-11-04 15:31:05', 'parenttype': 'DocType', 'fieldname': 'year_start_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-05-28 11:44:12', 'doctype': 'DocField', 'oldfieldname': 'is_fiscal_year_closed', 'owner': 'nabin@webnotestech.com', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Year Closed', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Fiscal Year', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05105', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-11-04 15:31:05', 'parenttype': 'DocType', 'fieldname': 'is_fiscal_year_closed', 'fieldtype': 'Select', 'options': '\nNo\nYes', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-07-31 12:54:14', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Repost Accounts', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': "Click on the button below to reset balances from your previous year's closing and repost your balances. You can use this if your previous year balance sheet has been changed and you wish to update your current accounts.", 'parent': 'Fiscal Year', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05772', 'idx': 7, 'default': None, 'colour': 'White:FFF', 'modified': '2010-11-04 15:31:05', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-05-04 16:20:41', 'doctype': 'DocField', 'oldfieldname': 'past_year', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Past Year', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Fiscal Year', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01963', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-11-04 15:31:05', 'parenttype': 'DocType', 'fieldname': 'past_year', 'fieldtype': 'Select', 'options': 'link:Fiscal Year', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-08-04 22:26:15', 'doctype': 'DocField', 'oldfieldname': 'company', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Company', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Fiscal Year', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02700', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-11-04 15:31:05', 'parenttype': 'DocType', 'fieldname': 'company', 'fieldtype': 'Link', 'options': 'Company', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2009-05-04 16:20:42', 'doctype': 'DocField', 'oldfieldname': '', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Repost Account Balances', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Fiscal Year', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01964', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-11-04 15:31:05', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Button', 'options': 'repost', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2010-05-27 15:40:53', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'nabin@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Repost Voucher Outstanding', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Fiscal Year', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05101', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-11-04 15:31:05', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'update_voucher_outstanding', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Fiscal Year
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:02',
+		'docstatus': 0,
+		'modified': '2011-01-03 17:52:39',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1307707462',
+		'allow_trash': 1,
+		'autoname': 'field:year',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 54
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Fiscal Year',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Fiscal Year',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocType, Fiscal Year
+	{
+		'doctype': 'DocType',
+		'name': 'Fiscal Year'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'submit': 0
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Year Details',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 2,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'year',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Year Name',
+		'oldfieldname': 'year',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'abbreviation',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'Abbreviation',
+		'oldfieldname': 'abbreviation',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'year_start_date',
+		'fieldtype': 'Date',
+		'idx': 5,
+		'label': 'Year Start Date',
+		'oldfieldname': 'year_start_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_fiscal_year_closed',
+		'fieldtype': 'Select',
+		'idx': 6,
+		'label': 'Year Closed',
+		'oldfieldname': 'is_fiscal_year_closed',
+		'oldfieldtype': 'Select',
+		'options': '\nNo\nYes',
+		'permlevel': 0,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': "Click on the button below to reset balances from your previous year's closing and repost your balances. You can use this if your previous year balance sheet has been changed and you wish to update your current accounts.",
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 7,
+		'label': 'Repost Accounts',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'past_year',
+		'fieldtype': 'Select',
+		'idx': 8,
+		'label': 'Past Year',
+		'oldfieldname': 'past_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 9,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 10,
+		'label': 'Repost Account Balances',
+		'oldfieldtype': 'Button',
+		'options': 'repost',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 11,
+		'label': 'Repost Voucher Outstanding',
+		'oldfieldtype': 'Button',
+		'options': 'update_voucher_outstanding',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/form_16a/form_16a.txt b/accounts/doctype/form_16a/form_16a.txt
index ea3ef95320..530d410e1a 100644
--- a/accounts/doctype/form_16a/form_16a.txt
+++ b/accounts/doctype/form_16a/form_16a.txt
@@ -1,1218 +1,477 @@
+# DocType, Form 16A
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': '1307707462',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
 		'creation': '2010-09-27 15:56:52',
-		'description': None,
 		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': 0,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
 		'modified': '2011-06-15 13:07:17',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Form 16A',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308123438',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 0,
 		'module': 'Accounts',
-		'name': 'Form 16A',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
+		'name': '__common__',
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
 		'version': 75
 	},
+
+	# These values are common for all DocFormat
 	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-09-27 15:56:52',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00694',
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Accounts Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 1,
-		'creation': '2010-09-27 15:56:52',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00695',
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Accounts Manager',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-09-27 15:56:52',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00696',
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Accounts User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 1,
-		'creation': '2010-09-27 15:56:52',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00697',
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Accounts User',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-09-27 15:56:52',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00698',
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-09-27 15:56:52',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00699',
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'creation': '2010-09-27 15:56:52',
-		'docstatus': 0,
 		'doctype': 'DocFormat',
 		'format': 'Form 16A Print Format',
 		'idx': 1,
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'DF000006',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'parent': 'Form 16A',
 		'parentfield': 'formats',
 		'parenttype': 'DocType'
 	},
+
+	# These values are common for all DocPerm
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Basic Info',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03927',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
+		'doctype': 'DocPerm',
+		'name': '__common__',
 		'parent': 'Form 16A',
-		'parentfield': 'fields',
+		'parentfield': 'permissions',
 		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'read': 1
 	},
+
+	# DocType, Form 16A
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
+		'doctype': 'DocType',
+		'name': 'Form 16A'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Accounts Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 1,
+		'doctype': 'DocPerm',
 		'idx': 2,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03928',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
+		'role': 'Accounts Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Accounts User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Accounts User',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocFormat
+	{
+		'doctype': 'DocFormat'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Basic Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 2,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'from_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
-		'in_filter': None,
 		'label': 'From Date',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03929',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'from_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'to_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 4,
-		'in_filter': None,
 		'label': 'To Date',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03930',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'to_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'tds_category',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 5,
 		'in_filter': 1,
 		'label': 'TDS Category',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03931',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'tds_category',
 		'oldfieldtype': 'Link',
 		'options': 'TDS Category',
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'party_name',
 		'fieldtype': 'Link',
 		'hidden': 0,
-		'icon': None,
 		'idx': 6,
 		'in_filter': 1,
 		'label': 'Party Name',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03932',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'party_name',
 		'oldfieldtype': 'Link',
 		'options': 'Account',
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'party_address',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 7,
-		'in_filter': None,
 		'label': 'Address',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03933',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'party_address',
 		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'pan_number',
 		'fieldtype': 'Data',
 		'hidden': 0,
-		'icon': None,
 		'idx': 8,
-		'in_filter': None,
 		'label': 'PAN No',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03934',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'pan_number',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 9,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03935',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'fiscal_year',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 10,
-		'in_filter': None,
 		'label': 'Fiscal Year',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03936',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'fiscal_year',
 		'oldfieldtype': 'Select',
 		'options': 'link:Fiscal Year',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'company',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 11,
 		'in_filter': 1,
 		'label': 'Company ',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03937',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'company',
 		'oldfieldtype': 'Link',
 		'options': 'Company',
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'company_address',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 12,
-		'in_filter': None,
 		'label': 'Company Address',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03938',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'company_address',
 		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'registration_details',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 13,
-		'in_filter': None,
 		'label': 'Registration Details',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03939',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'registration_details',
 		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 14,
-		'in_filter': None,
 		'label': 'Return Details',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03940',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 15,
-		'in_filter': None,
 		'label': 'Get Return Details',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03941',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
 		'options': 'get_return_ack_details',
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'form_16A_ack_details',
 		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
 		'idx': 16,
-		'in_filter': None,
 		'label': 'Form 16A Ack Details',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03942',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'form_16A_ack_details',
 		'oldfieldtype': 'Table',
 		'options': 'Form 16A Ack Detail',
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 17,
-		'in_filter': None,
 		'label': 'Payment Details',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03943',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 18,
-		'in_filter': None,
 		'label': 'Get TDS',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03944',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
 		'options': 'get_tds',
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'form_16A_tax_details',
 		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
 		'idx': 19,
-		'in_filter': None,
 		'label': 'Tax Details',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03945',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'form_16A_tax_details',
 		'oldfieldtype': 'Table',
 		'options': 'Form 16A Tax Detail',
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'total_amount',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 20,
-		'in_filter': None,
 		'label': 'Total Amount',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03946',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'total_amount',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-15 13:07:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'in_words',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 21,
-		'in_filter': None,
 		'label': 'In Words',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL05598',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 22,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03947',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
 		'options': 'Simple',
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 23,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03948',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:53',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'place',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 24,
-		'in_filter': None,
 		'label': 'Place',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03949',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'place',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:53',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'dt',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 25,
-		'in_filter': None,
 		'label': 'Date',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03950',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'dt',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:53',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 26,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03951',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:53',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'full_name',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 27,
-		'in_filter': None,
 		'label': 'Full Name',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03952',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'full_name',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-27 15:56:53',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'designation',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 28,
-		'in_filter': None,
 		'label': 'Designation',
-		'modified': '2011-06-15 13:07:17',
-		'modified_by': 'Administrator',
-		'name': 'FL03953',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'designation',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Form 16A',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	}
 ]
\ No newline at end of file
diff --git a/accounts/doctype/form_16a_ack_detail/form_16a_ack_detail.txt b/accounts/doctype/form_16a_ack_detail/form_16a_ack_detail.txt
index 1bd6e3fd0e..0f2c188c56 100644
--- a/accounts/doctype/form_16a_ack_detail/form_16a_ack_detail.txt
+++ b/accounts/doctype/form_16a_ack_detail/form_16a_ack_detail.txt
@@ -1 +1,63 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-05-28 10:54:48', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 1, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Form 16A Ack Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-05-28 10:54:48', 'doctype': 'DocField', 'oldfieldname': 'quarter', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Quarter', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Form 16A Ack Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02217', 'idx': 1, 'default': None, 'colour': None, 'modified': '2009-05-28 10:54:48', 'parenttype': 'DocType', 'fieldname': 'quarter', 'fieldtype': 'Select', 'options': '\nApr-Jun\nJul-Sept\nOct-Dec\nJan-Mar', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-05-28 10:54:48', 'doctype': 'DocField', 'oldfieldname': 'ack_no', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Acknowledgement No.', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Form 16A Ack Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02218', 'idx': 2, 'default': None, 'colour': None, 'modified': '2009-05-28 10:54:48', 'parenttype': 'DocType', 'fieldname': 'ack_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Form 16A Ack Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:02',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'show_in_menu': 0,
+		'version': 1
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Form 16A Ack Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Form 16A Ack Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Form 16A Ack Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'quarter',
+		'fieldtype': 'Select',
+		'idx': 1,
+		'label': 'Quarter',
+		'oldfieldname': 'quarter',
+		'oldfieldtype': 'Select',
+		'options': '\nApr-Jun\nJul-Sept\nOct-Dec\nJan-Mar'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'ack_no',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Acknowledgement No.',
+		'oldfieldname': 'ack_no',
+		'oldfieldtype': 'Data'
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/form_16a_tax_detail/form_16a_tax_detail.txt b/accounts/doctype/form_16a_tax_detail/form_16a_tax_detail.txt
index 4e606df712..86a25da5a5 100644
--- a/accounts/doctype/form_16a_tax_detail/form_16a_tax_detail.txt
+++ b/accounts/doctype/form_16a_tax_detail/form_16a_tax_detail.txt
@@ -1 +1,150 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-05-27 16:23:52', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 2, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': '', 'name': 'Form 16A Tax Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-27 16:53:54', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-05-27 16:23:52', 'doctype': 'DocField', 'oldfieldname': 'amount_paid', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Amount paid / credited', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Form 16A Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02203', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-27 16:53:54', 'parenttype': 'DocType', 'fieldname': 'amount_paid', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2009-05-27 16:23:52', 'doctype': 'DocField', 'oldfieldname': 'date_of_payment', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Date of payment / credit', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Form 16A Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02204', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-27 16:53:54', 'parenttype': 'DocType', 'fieldname': 'date_of_payment', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-05-27 16:23:52', 'doctype': 'DocField', 'oldfieldname': 'tds_main', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'TDS(Main)', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Form 16A Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02205', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-27 16:53:54', 'parenttype': 'DocType', 'fieldname': 'tds_main', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-05-27 16:23:52', 'doctype': 'DocField', 'oldfieldname': 'surcharge', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Surcharge', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Form 16A Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02206', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-09-27 16:53:54', 'parenttype': 'DocType', 'fieldname': 'surcharge', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-09-27 16:53:54', 'doctype': 'DocField', 'oldfieldname': 'cess_on_tds', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Cess on TDS', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Form 16A Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06137', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-09-27 16:53:54', 'parenttype': 'DocType', 'fieldname': 'cess_on_tds', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-05-27 16:23:52', 'doctype': 'DocField', 'oldfieldname': 'total_tax_deposited', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Total Tax Deposited', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Form 16A Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02209', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-09-27 16:53:54', 'parenttype': 'DocType', 'fieldname': 'total_tax_deposited', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-05-27 16:23:52', 'doctype': 'DocField', 'oldfieldname': 'cheque_no', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Cheque / DD No.', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Form 16A Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02210', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-09-27 16:53:54', 'parenttype': 'DocType', 'fieldname': 'cheque_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-05-27 16:23:52', 'doctype': 'DocField', 'oldfieldname': 'bsr_code', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'BSR Code', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Form 16A Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02211', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-09-27 16:53:54', 'parenttype': 'DocType', 'fieldname': 'bsr_code', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2009-05-27 16:23:52', 'doctype': 'DocField', 'oldfieldname': 'tax_deposited_date', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Tax Deposited Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Form 16A Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02212', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-09-27 16:53:54', 'parenttype': 'DocType', 'fieldname': 'tax_deposited_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-05-27 16:23:52', 'doctype': 'DocField', 'oldfieldname': 'challan_no', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Challan No.', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Form 16A Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02213', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-09-27 16:53:54', 'parenttype': 'DocType', 'fieldname': 'challan_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Form 16A Tax Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:02',
+		'docstatus': 0,
+		'modified': '2010-09-27 16:53:54',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'show_in_menu': 0,
+		'version': 1
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Form 16A Tax Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Form 16A Tax Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Form 16A Tax Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amount_paid',
+		'fieldtype': 'Currency',
+		'idx': 1,
+		'label': 'Amount paid / credited',
+		'oldfieldname': 'amount_paid',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'date_of_payment',
+		'fieldtype': 'Date',
+		'idx': 2,
+		'label': 'Date of payment / credit',
+		'oldfieldname': 'date_of_payment',
+		'oldfieldtype': 'Date'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tds_main',
+		'fieldtype': 'Currency',
+		'idx': 3,
+		'label': 'TDS(Main)',
+		'oldfieldname': 'tds_main',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'surcharge',
+		'fieldtype': 'Currency',
+		'idx': 4,
+		'label': 'Surcharge',
+		'oldfieldname': 'surcharge',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'cess_on_tds',
+		'fieldtype': 'Currency',
+		'idx': 5,
+		'label': 'Cess on TDS',
+		'oldfieldname': 'cess_on_tds',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'total_tax_deposited',
+		'fieldtype': 'Currency',
+		'idx': 8,
+		'label': 'Total Tax Deposited',
+		'oldfieldname': 'total_tax_deposited',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'cheque_no',
+		'fieldtype': 'Data',
+		'idx': 9,
+		'label': 'Cheque / DD No.',
+		'oldfieldname': 'cheque_no',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'bsr_code',
+		'fieldtype': 'Data',
+		'idx': 10,
+		'label': 'BSR Code',
+		'oldfieldname': 'bsr_code',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tax_deposited_date',
+		'fieldtype': 'Date',
+		'idx': 11,
+		'label': 'Tax Deposited Date',
+		'oldfieldname': 'tax_deposited_date',
+		'oldfieldtype': 'Date'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'challan_no',
+		'fieldtype': 'Data',
+		'idx': 12,
+		'label': 'Challan No.',
+		'oldfieldname': 'challan_no',
+		'oldfieldtype': 'Data'
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/gl_control/gl_control.txt b/accounts/doctype/gl_control/gl_control.txt
index b1964be998..f31b64d441 100644
--- a/accounts/doctype/gl_control/gl_control.txt
+++ b/accounts/doctype/gl_control/gl_control.txt
@@ -1 +1,31 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-12-06 11:45:17', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 300, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': '', 'name': 'GL Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-11-18 16:35:29', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
+# DocType, GL Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:03',
+		'docstatus': 0,
+		'modified': '2010-12-29 12:57:24',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 288
+	},
+
+	# DocType, GL Control
+	{
+		'doctype': 'DocType',
+		'name': 'GL Control'
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/gl_entry/gl_entry.txt b/accounts/doctype/gl_entry/gl_entry.txt
index 85d3c328eb..7278c4d13a 100644
--- a/accounts/doctype/gl_entry/gl_entry.txt
+++ b/accounts/doctype/gl_entry/gl_entry.txt
@@ -1 +1,323 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-12 12:09:20', 'search_fields': 'voucher_no,account,posting_date,against_voucher', 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 133, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': 'GL.#######', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'nabin@webnotestech.com', 'document_type': '', 'name': 'GL Entry', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-11-22 17:00:21', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM00033', 'parent': 'GL Entry', 'read': 1, 'create': 0, 'creation': '2009-03-12 12:09:20', 'modified': '2010-11-22 17:00:21', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 1, 'parenttype': 'DocType', 'role': 'Accounts Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': '', 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM01240', 'parent': 'GL Entry', 'read': 1, 'create': None, 'creation': '2010-11-22 16:15:13', 'modified': '2010-11-22 17:00:21', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'Accounts User', 'owner': 'nabin@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM01241', 'parent': 'GL Entry', 'read': 1, 'create': None, 'creation': '2010-11-22 17:00:21', 'modified': '2010-11-22 17:00:21', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 3, 'parenttype': 'DocType', 'role': 'Sales User', 'owner': 'nabin@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM01242', 'parent': 'GL Entry', 'read': 1, 'create': None, 'creation': '2010-11-22 17:00:21', 'modified': '2010-11-22 17:00:21', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 4, 'parenttype': 'DocType', 'role': 'Purchase User', 'owner': 'nabin@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'posting_date', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Posting Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'The date at which current entry will get or has actually executed.', 'parent': 'GL Entry', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL00346', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-11-22 17:00:21', 'parenttype': 'DocType', 'fieldname': 'posting_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'transaction_date', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Transaction Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'The date at which current entry is made in system.', 'parent': 'GL Entry', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00347', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-11-22 17:00:21', 'parenttype': 'DocType', 'fieldname': 'transaction_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-04-30 17:58:29', 'doctype': 'DocField', 'oldfieldname': 'aging_date', 'owner': 'nabin@webnotestech.com', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Aging Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Entry', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL04932', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-11-22 17:00:21', 'parenttype': 'DocType', 'fieldname': 'aging_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'account', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Account', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Entry', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL00348', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-11-22 17:00:21', 'parenttype': 'DocType', 'fieldname': 'account', 'fieldtype': 'Link', 'options': 'Account', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'cost_center', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Cost Center', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Entry', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL00349', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-11-22 17:00:21', 'parenttype': 'DocType', 'fieldname': 'cost_center', 'fieldtype': 'Link', 'options': 'Cost Center', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'debit', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Debit Amt', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Entry', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00350', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-11-22 17:00:21', 'parenttype': 'DocType', 'fieldname': 'debit', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'credit', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Credit Amt', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Entry', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00351', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-11-22 17:00:21', 'parenttype': 'DocType', 'fieldname': 'credit', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'against', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Against', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Entry', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00352', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-11-22 17:00:21', 'parenttype': 'DocType', 'fieldname': 'against', 'fieldtype': 'Text', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'against_voucher', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Against Voucher', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Entry', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL00353', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-11-22 17:00:21', 'parenttype': 'DocType', 'fieldname': 'against_voucher', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'against_voucher_type', 'owner': 'Administrator', 'reqd': None, 'in_filter': 0, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Against Voucher Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Entry', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL00354', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-11-22 17:00:21', 'parenttype': 'DocType', 'fieldname': 'against_voucher_type', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'voucher_type', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Voucher Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Entry', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL00355', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-11-22 17:00:21', 'parenttype': 'DocType', 'fieldname': 'voucher_type', 'fieldtype': 'Select', 'options': 'Journal Voucher\nReceivable Voucher\nPayable Voucher', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'voucher_no', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Voucher No', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Entry', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL00356', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-11-22 17:00:21', 'parenttype': 'DocType', 'fieldname': 'voucher_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Text', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'remarks', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Remarks', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Entry', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL00357', 'idx': 13, 'default': None, 'colour': None, 'modified': '2010-11-22 17:00:21', 'parenttype': 'DocType', 'fieldname': 'remarks', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'is_cancelled', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Is Cancelled', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Entry', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL00358', 'idx': 14, 'default': None, 'colour': None, 'modified': '2010-11-22 17:00:21', 'parenttype': 'DocType', 'fieldname': 'is_cancelled', 'fieldtype': 'Select', 'options': 'No\nYes', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-05-04 15:20:58', 'doctype': 'DocField', 'oldfieldname': 'is_opening', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Is Opening', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Entry', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01962', 'idx': 15, 'default': None, 'colour': None, 'modified': '2010-11-22 17:00:21', 'parenttype': 'DocType', 'fieldname': 'is_opening', 'fieldtype': 'Select', 'options': 'No\nYes', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-07-21 16:55:39', 'doctype': 'DocField', 'oldfieldname': 'is_advance', 'owner': 'Administrator', 'reqd': None, 'in_filter': 0, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Is Advance', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Entry', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL02619', 'idx': 16, 'default': None, 'colour': None, 'modified': '2010-11-22 17:00:21', 'parenttype': 'DocType', 'fieldname': 'is_advance', 'fieldtype': 'Select', 'options': 'No\nYes', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'fiscal_year', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Fiscal Year', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Entry', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL00359', 'idx': 17, 'default': None, 'colour': None, 'modified': '2010-11-22 17:00:21', 'parenttype': 'DocType', 'fieldname': 'fiscal_year', 'fieldtype': 'Select', 'options': 'link:Fiscal Year', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'company', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Company', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Entry', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL00360', 'idx': 18, 'default': None, 'colour': None, 'modified': '2010-11-22 17:00:21', 'parenttype': 'DocType', 'fieldname': 'company', 'fieldtype': 'Link', 'options': 'Company', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, GL Entry
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:03',
+		'docstatus': 0,
+		'modified': '2010-12-29 12:59:45',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1294312170',
+		'autoname': 'GL.#######',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'Accounts',
+		'name': '__common__',
+		'search_fields': 'voucher_no,account,posting_date,against_voucher',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 101
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'GL Entry',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'GL Entry',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, GL Entry
+	{
+		'doctype': 'DocType',
+		'name': 'GL Entry'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'role': 'Accounts User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'Accounts Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'System Manager'
+	},
+
+	# DocField
+	{
+		'description': 'The date at which current entry will get or has actually executed.',
+		'doctype': 'DocField',
+		'fieldname': 'posting_date',
+		'fieldtype': 'Date',
+		'idx': 1,
+		'in_filter': 1,
+		'label': 'Posting Date',
+		'oldfieldname': 'posting_date',
+		'oldfieldtype': 'Date',
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'description': 'The date at which current entry is made in system.',
+		'doctype': 'DocField',
+		'fieldname': 'transaction_date',
+		'fieldtype': 'Date',
+		'idx': 2,
+		'label': 'Transaction Date',
+		'oldfieldname': 'transaction_date',
+		'oldfieldtype': 'Date'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'aging_date',
+		'fieldtype': 'Date',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Aging Date',
+		'oldfieldname': 'aging_date',
+		'oldfieldtype': 'Date',
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'account',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Account',
+		'oldfieldname': 'account',
+		'oldfieldtype': 'Link',
+		'options': 'Account',
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'cost_center',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Cost Center',
+		'oldfieldname': 'cost_center',
+		'oldfieldtype': 'Link',
+		'options': 'Cost Center',
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'debit',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'label': 'Debit Amt',
+		'oldfieldname': 'debit',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'credit',
+		'fieldtype': 'Currency',
+		'idx': 7,
+		'label': 'Credit Amt',
+		'oldfieldname': 'credit',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'against',
+		'fieldtype': 'Text',
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'Against',
+		'oldfieldname': 'against',
+		'oldfieldtype': 'Text'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'against_voucher',
+		'fieldtype': 'Data',
+		'idx': 9,
+		'in_filter': 1,
+		'label': 'Against Voucher',
+		'oldfieldname': 'against_voucher',
+		'oldfieldtype': 'Data',
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'against_voucher_type',
+		'fieldtype': 'Data',
+		'idx': 10,
+		'in_filter': 0,
+		'label': 'Against Voucher Type',
+		'oldfieldname': 'against_voucher_type',
+		'oldfieldtype': 'Data',
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'voucher_type',
+		'fieldtype': 'Select',
+		'idx': 11,
+		'in_filter': 1,
+		'label': 'Voucher Type',
+		'oldfieldname': 'voucher_type',
+		'oldfieldtype': 'Select',
+		'options': 'Journal Voucher\nReceivable Voucher\nPayable Voucher',
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'voucher_no',
+		'fieldtype': 'Data',
+		'idx': 12,
+		'in_filter': 1,
+		'label': 'Voucher No',
+		'oldfieldname': 'voucher_no',
+		'oldfieldtype': 'Data',
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'remarks',
+		'fieldtype': 'Text',
+		'idx': 13,
+		'in_filter': 1,
+		'label': 'Remarks',
+		'no_copy': 1,
+		'oldfieldname': 'remarks',
+		'oldfieldtype': 'Text',
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_cancelled',
+		'fieldtype': 'Select',
+		'idx': 14,
+		'in_filter': 1,
+		'label': 'Is Cancelled',
+		'oldfieldname': 'is_cancelled',
+		'oldfieldtype': 'Select',
+		'options': 'No\nYes',
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_opening',
+		'fieldtype': 'Select',
+		'idx': 15,
+		'in_filter': 1,
+		'label': 'Is Opening',
+		'oldfieldname': 'is_opening',
+		'oldfieldtype': 'Select',
+		'options': 'No\nYes',
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_advance',
+		'fieldtype': 'Select',
+		'idx': 16,
+		'in_filter': 0,
+		'label': 'Is Advance',
+		'oldfieldname': 'is_advance',
+		'oldfieldtype': 'Select',
+		'options': 'No\nYes',
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 17,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 18,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'search_index': 1
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/journal_voucher/journal_voucher.txt b/accounts/doctype/journal_voucher/journal_voucher.txt
index b0aaaab47f..43ec61437a 100644
--- a/accounts/doctype/journal_voucher/journal_voucher.txt
+++ b/accounts/doctype/journal_voucher/journal_voucher.txt
@@ -1,2022 +1,825 @@
+# DocType, Journal Voucher
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': '1303273485',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
 		'creation': '2010-08-08 17:09:06',
-		'description': None,
 		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
 		'modified': '2011-04-06 14:41:47',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Journal Voucher',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1305714002',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
 		'module': 'Accounts',
-		'name': 'Journal Voucher',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
+		'name': '__common__',
 		'search_fields': 'voucher_type,posting_date, due_date, cheque_no',
 		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
 		'subject': ' ',
 		'tag_fields': 'voucher_type',
-		'use_template': None,
 		'version': 307
 	},
+
+	# These values are common for all DocFormat
+	{
+		'doctype': 'DocFormat',
+		'name': '__common__',
+		'parent': 'Journal Voucher',
+		'parentfield': 'formats',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Journal Voucher',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Journal Voucher
+	{
+		'doctype': 'DocType',
+		'name': 'Journal Voucher'
+	},
+
+	# DocPerm
 	{
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'creation': '2010-08-08 17:09:06',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 1,
-		'match': None,
-		'modified': '2010-08-08 17:09:06',
-		'modified_by': 'Administrator',
-		'name': 'PERM00294',
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'read': 1,
 		'role': 'Accounts Manager',
 		'submit': 0,
 		'write': 0
 	},
+
+	# DocPerm
 	{
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2010-08-08 17:09:06',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 2,
-		'match': None,
-		'modified': '2010-08-08 17:09:06',
-		'modified_by': 'Administrator',
-		'name': 'PERM00295',
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'read': 1,
 		'role': 'Accounts Manager',
 		'submit': 1,
 		'write': 1
 	},
+
+	# DocPerm
 	{
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2010-08-08 17:09:06',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 3,
-		'match': None,
-		'modified': '2010-08-08 17:09:06',
-		'modified_by': 'Administrator',
-		'name': 'PERM00296',
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'read': 1,
 		'role': 'Accounts User',
 		'submit': 1,
 		'write': 1
 	},
+
+	# DocPerm
 	{
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'creation': '2010-08-08 17:09:06',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 4,
-		'match': None,
-		'modified': '2010-08-08 17:09:06',
-		'modified_by': 'Administrator',
-		'name': 'PERM00297',
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'read': 1,
 		'role': 'Accounts User',
 		'submit': 0,
 		'write': 0
 	},
+
+	# DocFormat
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 18:06:13',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Basic Info',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': '000000488',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'doctype': 'DocFormat',
+		'format': 'Payment Receipt Voucher',
+		'idx': 1
 	},
+
+	# DocFormat
+	{
+		'doctype': 'DocFormat',
+		'format': 'Cheque Printing Format',
+		'idx': 2
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Basic Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 18:06:13',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
-		'in_filter': None,
 		'label': '1. Select Series and Dates',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': '000000489',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
 		'options': 'Simple',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 18:06:13',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': '000000490',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'voucher_type',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 4,
 		'in_filter': 1,
 		'label': 'Voucher Type',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01689',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'voucher_type',
 		'oldfieldtype': 'Select',
 		'options': '\nJournal Entry\nBank Voucher\nCash Voucher\nCredit Card Voucher\nDebit Note\nCredit Note\nContra Voucher\nExcise Voucher\nWrite Off Voucher',
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-04-06 18:06:12',
-		'default': None,
 		'depends_on': "eval:doc.voucher_type == 'Write Off Voucher'",
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'write_off_amount',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 5,
-		'in_filter': None,
 		'label': 'Write Off Amount <=',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': '000000475',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'report_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-04-06 18:06:12',
 		'default': 'Accounts Receivable',
 		'depends_on': "eval:doc.voucher_type == 'Write Off Voucher'",
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'write_off_based_on',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 6,
-		'in_filter': None,
 		'label': 'Write Off Based On',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': '000000476',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'Accounts Receivable\nAccounts Payable',
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'report_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:06',
-		'default': 'JV',
-		'depends_on': None,
 		'description': 'To manage multiple series please go to Setup > Manage Series',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'naming_series',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 7,
-		'in_filter': None,
 		'label': 'Series',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01690',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'naming_series',
 		'oldfieldtype': 'Select',
 		'options': 'JV',
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:06',
 		'default': 'Today',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'voucher_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 8,
 		'in_filter': 1,
 		'label': 'Voucher Date',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01691',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'voucher_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 0,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
 		'description': 'The date at which current entry will get or has actually executed.',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'posting_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 9,
 		'in_filter': 1,
 		'label': 'Posting Date',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01692',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'posting_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'due_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 10,
-		'in_filter': None,
 		'label': 'Due Date',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01693',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'due_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
 		'description': 'The date at which current entry is corrected in the system.',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'amendment_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 11,
-		'in_filter': None,
 		'label': 'Amendment Date',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01694',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'amendment_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'amended_from',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 12,
-		'in_filter': None,
 		'label': 'Amended From',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01695',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'amended_from',
 		'oldfieldtype': 'Link',
 		'options': 'Journal Voucher',
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-04-06 18:06:12',
-		'default': None,
 		'depends_on': "eval:doc.voucher_type == 'Write Off Voucher'",
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 13,
-		'in_filter': None,
 		'label': 'Get Outstanding Invoices',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': '000000477',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'get_outstanding_invoices',
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Server',
-		'width': None
+		'trigger': 'Server'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 18:06:13',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 14,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': '000000491',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'cheque_no',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 15,
 		'in_filter': 1,
 		'label': 'Cheque No',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01697',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'cheque_no',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'cheque_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 16,
-		'in_filter': None,
 		'label': 'Cheque Date',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01698',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'cheque_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'clearance_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 17,
 		'in_filter': 1,
 		'label': 'Clearance Date',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01699',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'clearance_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'user_remark',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 18,
 		'in_filter': 1,
 		'label': 'User Remark',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01700',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'user_remark',
 		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
 		'description': 'User Remark will be added to Auto Remark',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'remark',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 19,
-		'in_filter': None,
 		'label': 'Remark',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01701',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'remark',
 		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 18:06:13',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 20,
-		'in_filter': None,
 		'label': '2. Add / Edit GL Entries',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': '000000492',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
 		'options': 'Simple',
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'entries',
 		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
 		'idx': 21,
-		'in_filter': None,
 		'label': 'Entries',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01703',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'entries',
 		'oldfieldtype': 'Table',
 		'options': 'Journal Voucher Detail',
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 22,
-		'in_filter': None,
 		'label': 'Get Balance',
-		'modified': '2011-03-31 15:34:24',
-		'modified_by': 'Administrator',
-		'name': 'FL01704',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 18:06:12',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
-		'label': 'Get Balance',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': '000000480',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'total_debit',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 23,
 		'in_filter': 1,
 		'label': 'Total Debit',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01705',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'total_debit',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'total_credit',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 24,
 		'in_filter': 1,
 		'label': 'Total Credit',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01706',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'total_credit',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'difference',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 25,
-		'in_filter': None,
 		'label': 'Difference',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01707',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'difference',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 18:06:13',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 26,
-		'in_filter': None,
 		'label': 'Addtional Info',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': '000000493',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 18:06:13',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 27,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': '000000494',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'bill_no',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 28,
-		'in_filter': None,
 		'label': 'Bill No',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01710',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'bill_no',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'bill_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 29,
-		'in_filter': None,
 		'label': 'Bill Date',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01711',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'bill_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:06',
 		'default': 'No',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'is_opening',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 30,
 		'in_filter': 1,
 		'label': 'Is Opening',
-		'modified': '2011-04-06 18:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01712',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'is_opening',
 		'oldfieldtype': 'Select',
 		'options': 'No\nYes',
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
 		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'aging_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 31,
-		'in_filter': None,
 		'label': 'Aging Date',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': 'FL01713',
-		'no_column': None,
 		'no_copy': 0,
 		'oldfieldname': 'aging_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'cancel_reason',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 32,
-		'in_filter': None,
 		'label': 'Cancel Reason',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': 'FL01714',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'cancel_reason',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-31 15:34:24',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'pay_to_recd_from',
 		'fieldtype': 'Data',
 		'hidden': 0,
-		'icon': None,
 		'idx': 33,
-		'in_filter': None,
 		'label': 'Pay To / Recd From',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': '000000326',
-		'no_column': None,
 		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'report_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-31 15:34:24',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'total_amount',
 		'fieldtype': 'Data',
 		'hidden': 0,
-		'icon': None,
 		'idx': 34,
-		'in_filter': None,
 		'label': 'Total Amount',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': '000000327',
-		'no_column': None,
 		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'report_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-31 15:34:24',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'total_amount_in_words',
 		'fieldtype': 'Data',
 		'hidden': 0,
-		'icon': None,
 		'idx': 35,
-		'in_filter': None,
 		'label': 'Total Amount in Words',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': '000000328',
-		'no_column': None,
 		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'report_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 18:06:13',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 36,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': '000000495',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'fiscal_year',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 37,
 		'in_filter': 1,
 		'label': 'Fiscal Year',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': 'FL01716',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'fiscal_year',
 		'oldfieldtype': 'Select',
 		'options': 'link:Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'company',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 38,
 		'in_filter': 1,
 		'label': 'Company',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': 'FL01717',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'company',
 		'oldfieldtype': 'Link',
 		'options': 'Company',
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
 		'allow_on_submit': 1,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'select_print_heading',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 39,
-		'in_filter': None,
 		'label': 'Select Print Heading',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': 'FL01718',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'select_print_heading',
 		'oldfieldtype': 'Link',
 		'options': 'Print Heading',
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
 		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 18:06:13',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 40,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': '000000496',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
 		'options': 'Simple',
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
 		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 41,
-		'in_filter': None,
 		'label': 'View Ledger Entry',
-		'modified': '2011-03-31 15:34:24',
-		'modified_by': 'Administrator',
-		'name': 'FL01720',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2011-04-06 18:06:13',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 41,
-		'in_filter': None,
-		'label': 'View Ledger Entry',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': '000000485',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 18:06:13',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 42,
-		'in_filter': None,
 		'label': 'TDS',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': '000000497',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
 		'default': 'No',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'tds_applicable',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 43,
 		'in_filter': 1,
 		'label': 'TDS Applicable',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': 'FL01722',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'tds_applicable',
 		'oldfieldtype': 'Select',
 		'options': '\nYes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'tds_category',
 		'fieldtype': 'Select',
 		'hidden': 0,
-		'icon': None,
 		'idx': 44,
 		'in_filter': 1,
 		'label': 'TDS Category',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': 'FL01723',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'tds_category',
 		'oldfieldtype': 'Select',
 		'options': 'link:TDS Category',
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
 		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'supplier_account',
 		'fieldtype': 'Link',
 		'hidden': 0,
-		'icon': None,
 		'idx': 45,
-		'in_filter': None,
 		'label': 'Supplier Account',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': 'FL01724',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'supplier_account',
 		'oldfieldtype': 'Link',
 		'options': 'Account',
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 46,
-		'in_filter': None,
 		'label': 'Get TDS',
-		'modified': '2011-03-31 15:34:24',
-		'modified_by': 'Administrator',
-		'name': 'FL01725',
-		'no_column': None,
 		'no_copy': 0,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-04-06 18:06:13',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 46,
-		'in_filter': None,
-		'label': 'Get TDS',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': '000000487',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
 		'description': 'Tax Code will be populated based on account head mentioned in TDS Category master',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'tax_code',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 47,
-		'in_filter': None,
 		'label': 'TDS Account Head',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': 'FL01726',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'tax_code',
 		'oldfieldtype': 'Link',
 		'options': 'Account',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'rate',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 48,
-		'in_filter': None,
 		'label': 'Rate',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': 'FL01727',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'rate',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'ded_amount',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 49,
-		'in_filter': None,
 		'label': 'Amount',
-		'modified': '2011-04-06 18:06:13',
-		'modified_by': 'Administrator',
-		'name': 'FL01728',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'ded_amount',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Journal Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt b/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
index 8ce85745b9..39da0841f7 100644
--- a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
+++ b/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
@@ -1 +1,191 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-03-12 12:09:21', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 4, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': 'JVD.######', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': '', 'name': 'Journal Voucher Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-10-01 16:24:51', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:09:21', 'doctype': 'DocField', 'oldfieldname': 'account', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Account', 'width': '180px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Journal Voucher Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL00396', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-10-01 16:24:51', 'parenttype': 'DocType', 'fieldname': 'account', 'fieldtype': 'Link', 'options': 'Account', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:09:21', 'doctype': 'DocField', 'oldfieldname': 'cost_center', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Cost Center', 'width': '180px', 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Journal Voucher Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL00397', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-10-01 16:24:51', 'parenttype': 'DocType', 'fieldname': 'cost_center', 'fieldtype': 'Link', 'options': 'Cost Center', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:21', 'doctype': 'DocField', 'oldfieldname': 'balance', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Balance', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Journal Voucher Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00398', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-10-01 16:24:51', 'parenttype': 'DocType', 'fieldname': 'balance', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:09:21', 'doctype': 'DocField', 'oldfieldname': 'debit', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Debit', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Journal Voucher Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00399', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-10-01 16:24:51', 'parenttype': 'DocType', 'fieldname': 'debit', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:09:21', 'doctype': 'DocField', 'oldfieldname': 'credit', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Credit', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Journal Voucher Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00400', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-10-01 16:24:51', 'parenttype': 'DocType', 'fieldname': 'credit', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:09:21', 'doctype': 'DocField', 'oldfieldname': 'against_voucher', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Against Payable', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Journal Voucher Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL00401', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-10-01 16:24:51', 'parenttype': 'DocType', 'fieldname': 'against_voucher', 'fieldtype': 'Link', 'options': 'Payable Voucher', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:09:21', 'doctype': 'DocField', 'oldfieldname': 'against_invoice', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Against Receivable', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Journal Voucher Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL00402', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-10-01 16:24:51', 'parenttype': 'DocType', 'fieldname': 'against_invoice', 'fieldtype': 'Link', 'options': 'Receivable Voucher', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Link', 'creation': '2010-10-01 16:24:37', 'doctype': 'DocField', 'oldfieldname': 'against_jv', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Against JV', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Journal Voucher Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06160', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-10-01 16:24:51', 'parenttype': 'DocType', 'fieldname': 'against_jv', 'fieldtype': 'Link', 'options': 'Journal Voucher', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Select', 'creation': '2009-07-22 13:05:33', 'doctype': 'DocField', 'oldfieldname': 'is_advance', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Is Advance', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Journal Voucher Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02621', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-10-01 16:24:51', 'parenttype': 'DocType', 'fieldname': 'is_advance', 'fieldtype': 'Select', 'options': 'No\nYes', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Text', 'creation': '2009-04-04 12:03:17', 'doctype': 'DocField', 'oldfieldname': 'against_account', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Against Account', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Journal Voucher Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01630', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-10-01 16:24:51', 'parenttype': 'DocType', 'fieldname': 'against_account', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Journal Voucher Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:06',
+		'docstatus': 0,
+		'modified': '2010-10-01 16:24:51',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'JVD.######',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 2
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Journal Voucher Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Journal Voucher Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Journal Voucher Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'account',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'in_filter': 1,
+		'label': 'Account',
+		'oldfieldname': 'account',
+		'oldfieldtype': 'Link',
+		'options': 'Account',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client',
+		'width': '180px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'cost_center',
+		'fieldtype': 'Link',
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'Cost Center',
+		'oldfieldname': 'cost_center',
+		'oldfieldtype': 'Link',
+		'options': 'Cost Center',
+		'permlevel': 0,
+		'search_index': 1,
+		'width': '180px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'balance',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Balance',
+		'no_copy': 1,
+		'oldfieldname': 'balance',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'debit',
+		'fieldtype': 'Currency',
+		'idx': 4,
+		'label': 'Debit',
+		'oldfieldname': 'debit',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'credit',
+		'fieldtype': 'Currency',
+		'idx': 5,
+		'label': 'Credit',
+		'oldfieldname': 'credit',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'against_voucher',
+		'fieldtype': 'Link',
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Against Payable',
+		'no_copy': 1,
+		'oldfieldname': 'against_voucher',
+		'oldfieldtype': 'Link',
+		'options': 'Payable Voucher',
+		'permlevel': 0,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'against_invoice',
+		'fieldtype': 'Link',
+		'idx': 7,
+		'in_filter': 1,
+		'label': 'Against Receivable',
+		'no_copy': 1,
+		'oldfieldname': 'against_invoice',
+		'oldfieldtype': 'Link',
+		'options': 'Receivable Voucher',
+		'permlevel': 0,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'against_jv',
+		'fieldtype': 'Link',
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'Against JV',
+		'no_copy': 1,
+		'oldfieldname': 'against_jv',
+		'oldfieldtype': 'Link',
+		'options': 'Journal Voucher',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_advance',
+		'fieldtype': 'Select',
+		'idx': 9,
+		'label': 'Is Advance',
+		'no_copy': 1,
+		'oldfieldname': 'is_advance',
+		'oldfieldtype': 'Select',
+		'options': 'No\nYes',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'against_account',
+		'fieldtype': 'Text',
+		'hidden': 1,
+		'idx': 10,
+		'label': 'Against Account',
+		'no_copy': 1,
+		'oldfieldname': 'against_account',
+		'oldfieldtype': 'Text',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/ledger_balance_export/ledger_balance_export.txt b/accounts/doctype/ledger_balance_export/ledger_balance_export.txt
index b3998b4e18..251588c8e6 100755
--- a/accounts/doctype/ledger_balance_export/ledger_balance_export.txt
+++ b/accounts/doctype/ledger_balance_export/ledger_balance_export.txt
@@ -1,321 +1,129 @@
+# DocType, Ledger Balance Export
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2011-05-24 14:41:08',
+		'docstatus': 0,
+		'modified': '2011-05-24 15:22:43',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
 	{
 		'_last_update': '1306229235',
-		'_user_tags': None,
-		'allow_attach': None,
 		'allow_copy': 1,
 		'allow_email': 1,
 		'allow_print': 1,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-25 10:54:06',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocType',
 		'document_type': 'Other',
-		'dt_template': None,
 		'hide_heading': 0,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
 		'issingle': 1,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-24 15:22:43',
-		'modified_by': 'Administrator',
 		'module': 'Accounts',
-		'name': 'Ledger Balance Export',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
+		'name': '__common__',
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': None,
 		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
 		'version': 9
 	},
+
+	# These values are common for all DocField
 	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2011-05-25 10:54:06',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-05-25 10:54:06',
-		'modified_by': 'Administrator',
-		'name': 'PERM00866',
-		'owner': 'Administrator',
-		'parent': 'Ledger Balance Export',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Accounts Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2011-05-25 10:54:06',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-05-25 10:54:06',
-		'modified_by': 'Administrator',
-		'name': 'PERM00867',
-		'owner': 'Administrator',
-		'parent': 'Ledger Balance Export',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Accounts User',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 11:02:00',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Select Date Range',
-		'modified': '2011-05-25 11:02:00',
-		'modified_by': 'Administrator',
-		'name': 'FL05003',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
+		'name': '__common__',
 		'parent': 'Ledger Balance Export',
 		'parentfield': 'fields',
 		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Ledger Balance Export',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'write': 1
+	},
+
+	# DocType, Ledger Balance Export
+	{
+		'doctype': 'DocType',
+		'name': 'Ledger Balance Export'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'Accounts Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'Accounts User'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 1,
+		'label': 'Select Date Range'
+	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 10:54:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'from_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
-		'in_filter': None,
 		'label': 'From Date',
-		'modified': '2011-05-25 11:02:00',
-		'modified_by': 'Administrator',
-		'name': 'FL04997',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ledger Balance Export',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 10:54:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'to_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
-		'in_filter': None,
 		'label': 'To Date',
-		'modified': '2011-05-25 11:02:00',
-		'modified_by': 'Administrator',
-		'name': 'FL04998',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ledger Balance Export',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 11:02:00',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 4,
-		'in_filter': None,
-		'label': 'Select ledgers',
-		'modified': '2011-05-25 11:02:00',
-		'modified_by': 'Administrator',
-		'name': 'FL05004',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ledger Balance Export',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Select ledgers'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 10:54:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'ledger_details',
 		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
 		'idx': 5,
-		'in_filter': None,
 		'label': 'Ledger Details',
-		'modified': '2011-05-25 11:02:00',
-		'modified_by': 'Administrator',
-		'name': 'FL05000',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Ledger Detail',
-		'owner': 'Administrator',
-		'parent': 'Ledger Balance Export',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'Ledger Detail'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-25 10:54:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 6,
-		'in_filter': None,
 		'label': 'Export Report',
-		'modified': '2011-05-25 11:02:00',
-		'modified_by': 'Administrator',
-		'name': 'FL05001',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ledger Balance Export',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/doctype/ledger_detail/ledger_detail.txt b/accounts/doctype/ledger_detail/ledger_detail.txt
index a9afe96f1f..f4d1084e3c 100755
--- a/accounts/doctype/ledger_detail/ledger_detail.txt
+++ b/accounts/doctype/ledger_detail/ledger_detail.txt
@@ -1,95 +1,52 @@
+# DocType, Ledger Detail
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 10:54:06',
-		'description': None,
+		'creation': '2011-05-24 14:50:42',
 		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': 1,
-		'max_attachments': None,
-		'menu_index': None,
 		'modified': '2011-05-24 15:24:03',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
 		'module': 'Accounts',
-		'name': 'Ledger Detail',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
+		'name': '__common__',
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': None,
 		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
 		'version': 3
 	},
+
+	# These values are common for all DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 10:54:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'account',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 1,
-		'in_filter': None,
 		'label': 'Account',
-		'modified': '2011-05-25 10:54:06',
-		'modified_by': 'Administrator',
-		'name': 'FL05002',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
+		'name': '__common__',
 		'options': 'Account',
-		'owner': 'Administrator',
 		'parent': 'Ledger Detail',
 		'parentfield': 'fields',
 		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
 		'width': '300px'
+	},
+
+	# DocType, Ledger Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Ledger Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/doctype/mode_of_payment/mode_of_payment.txt b/accounts/doctype/mode_of_payment/mode_of_payment.txt
index 2aeef29b8b..ac11016409 100644
--- a/accounts/doctype/mode_of_payment/mode_of_payment.txt
+++ b/accounts/doctype/mode_of_payment/mode_of_payment.txt
@@ -1 +1,73 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-05-04 12:05:50', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'harshada@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 4, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'field:mode_of_payment', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Mode of Payment', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00997', 'parent': 'Mode of Payment', 'read': 1, 'create': 1, 'creation': '2010-05-04 12:05:50', 'modified': '2010-09-20 09:51:10', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Accounts Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-05-04 12:05:50', 'doctype': 'DocField', 'oldfieldname': 'mode_of_payment', 'owner': 'harshada@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Mode of Payment', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Mode of Payment', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04973', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 09:51:10', 'parenttype': 'DocType', 'fieldname': 'mode_of_payment', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Mode of Payment
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:10',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'field:mode_of_payment',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 3
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'mode_of_payment',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Mode of Payment',
+		'name': '__common__',
+		'oldfieldname': 'mode_of_payment',
+		'oldfieldtype': 'Data',
+		'parent': 'Mode of Payment',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'Mode of Payment',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'Accounts Manager',
+		'write': 1
+	},
+
+	# DocType, Mode of Payment
+	{
+		'doctype': 'DocType',
+		'name': 'Mode of Payment'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField'
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/payable_voucher/payable_voucher.txt b/accounts/doctype/payable_voucher/payable_voucher.txt
index 95d5a47b6c..c330e8d508 100644
--- a/accounts/doctype/payable_voucher/payable_voucher.txt
+++ b/accounts/doctype/payable_voucher/payable_voucher.txt
@@ -1,3171 +1,1237 @@
+# DocType, Payable Voucher
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': '1307707462',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
 		'creation': '2010-08-08 17:09:11',
-		'description': None,
 		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
 		'modified': '2011-06-21 17:01:01',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308741898',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
 		'module': 'Accounts',
-		'name': 'Payable Voucher',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
+		'name': '__common__',
 		'read_only_onload': 1,
 		'search_fields': 'posting_date, credit_to, fiscal_year, bill_no, grand_total, outstanding_amount',
 		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
 		'subject': 'From %(supplier_name)s worth %(grand_total)s due on %(due_date)s | %(outstanding_amount)s outstanding',
-		'tag_fields': None,
-		'use_template': None,
 		'version': 518
 	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Payable Voucher',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Payable Voucher',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Payable Voucher
+	{
+		'doctype': 'DocType',
+		'name': 'Payable Voucher'
+	},
+
+	# DocPerm
 	{
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'creation': '2010-08-08 17:09:11',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 1,
-		'match': None,
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'PERM00374',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'read': 1,
 		'role': 'Accounts Manager',
 		'submit': 0,
 		'write': 0
 	},
+
+	# DocPerm
 	{
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2010-08-08 17:09:11',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 2,
-		'match': None,
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'PERM00375',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'read': 1,
 		'role': 'Accounts Manager',
 		'submit': 1,
 		'write': 1
 	},
+
+	# DocPerm
 	{
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'creation': '2010-08-08 17:09:11',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 3,
-		'match': None,
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'PERM00376',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'read': 1,
 		'role': 'Accounts User',
 		'submit': 0,
 		'write': 0
 	},
+
+	# DocPerm
 	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:11',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 4,
-		'match': None,
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'PERM00377',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'read': 1,
-		'role': 'Purchase User',
-		'submit': None,
-		'write': None
+		'role': 'Purchase User'
 	},
+
+	# DocPerm
 	{
 		'amend': 0,
 		'cancel': 0,
 		'create': 1,
-		'creation': '2010-08-08 17:09:11',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 5,
-		'match': None,
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'PERM00378',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'read': 1,
 		'role': 'Purchase User',
 		'submit': 0,
 		'write': 1
 	},
+
+	# DocPerm
 	{
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2010-08-08 17:09:11',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 6,
-		'match': None,
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'PERM00379',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'read': 1,
 		'role': 'Accounts User',
 		'submit': 1,
 		'write': 1
 	},
+
+	# DocPerm
 	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:11',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 7,
 		'match': 'supplier',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'PERM00380',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'read': 1,
-		'role': 'Supplier',
-		'submit': None,
-		'write': None
+		'role': 'Supplier'
 	},
+
+	# DocField
 	{
 		'allow_on_submit': 0,
-		'colour': None,
-		'creation': '2011-05-28 10:26:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 1,
-		'in_filter': None,
 		'label': 'Basic Info',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05509',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05510',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
 		'description': 'To manage multiple series please go to Setup > Manage Series',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'naming_series',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
-		'in_filter': None,
 		'label': 'Series',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02063',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'naming_series',
 		'oldfieldtype': 'Select',
 		'options': 'BILL\nBILLJ',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
 		'report_hide': 0,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
 		'description': 'The account to which you will pay (have paid) the money to.',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'credit_to',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 4,
 		'in_filter': 1,
 		'label': 'Credit To',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02058',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'credit_to',
 		'oldfieldtype': 'Link',
 		'options': 'Account',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
 		'reqd': 1,
 		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'amended_from',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 5,
-		'in_filter': None,
 		'label': 'Amended From',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02061',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'amended_from',
 		'oldfieldtype': 'Link',
 		'options': 'Payable Voucher',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'supplier',
 		'fieldtype': 'Link',
 		'hidden': 0,
-		'icon': None,
 		'idx': 6,
-		'in_filter': None,
 		'label': 'Supplier',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02059',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'supplier',
 		'oldfieldtype': 'Link',
 		'options': 'Supplier',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'supplier_address',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 7,
-		'in_filter': None,
 		'label': 'Supplier Address',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02060',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'Address',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'contact_person',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 8,
-		'in_filter': None,
 		'label': 'Contact Person',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05495',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'Contact',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'supplier_name',
 		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 9,
-		'in_filter': None,
 		'label': 'Name',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL03777',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'supplier_name',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'address_display',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 10,
-		'in_filter': None,
 		'label': 'Address',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05496',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'contact_display',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 11,
-		'in_filter': None,
 		'label': 'Contact',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05497',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'contact_mobile',
 		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 12,
-		'in_filter': None,
 		'label': 'Mobile No',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05498',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'contact_email',
 		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 13,
-		'in_filter': None,
 		'label': 'Contact Email',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05499',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 14,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05511',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
 		'default': 'Today',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'voucher_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 15,
 		'in_filter': 1,
 		'label': 'Voucher Date',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02064',
-		'no_column': None,
 		'no_copy': 0,
 		'oldfieldname': 'voucher_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'due_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 16,
 		'in_filter': 1,
 		'label': 'Due Date',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02065',
-		'no_column': None,
 		'no_copy': 0,
 		'oldfieldname': 'due_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
 		'default': 'Today',
-		'depends_on': None,
 		'description': 'The date at which current entry will get or has actually executed.',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'posting_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 17,
 		'in_filter': 1,
 		'label': 'Posting Date',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02066',
-		'no_column': None,
 		'no_copy': 0,
 		'oldfieldname': 'posting_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
 		'description': 'If not applicable please enter: NA',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'bill_no',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 18,
 		'in_filter': 1,
 		'label': 'Bill No',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02086',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'bill_no',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'bill_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 19,
 		'in_filter': 1,
 		'label': 'Bill Date',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02087',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'bill_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
 		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
 		'description': 'The date at which current entry is corrected in the system.',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'amendment_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 20,
-		'in_filter': None,
 		'label': 'Amendment Date',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02067',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'amendment_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'mode_of_payment',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 21,
-		'in_filter': None,
 		'label': 'Mode of Payment',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02097',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'mode_of_payment',
 		'oldfieldtype': 'Select',
 		'options': 'link:Mode of Payment',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 22,
-		'in_filter': None,
 		'label': 'Items',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05512',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
 		'description': 'Select Items from Purchase Order',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'purchase_order_main',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 23,
-		'in_filter': None,
 		'label': 'Purchase Order',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02069',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'purchase_order_main',
 		'oldfieldtype': 'Link',
 		'options': 'Purchase Order',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
 		'description': 'Select Items from Purchase Receipt',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'purchase_receipt_main',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 24,
-		'in_filter': None,
 		'label': 'Purchase Receipt',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02070',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'purchase_receipt_main',
 		'oldfieldtype': 'Link',
 		'options': 'Purchase Receipt',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 25,
-		'in_filter': None,
 		'label': 'Get Items',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02071',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
 		'options': 'pull_details',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 26,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05513',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'currency',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 27,
-		'in_filter': None,
 		'label': 'Bill Currency',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02088',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'currency',
 		'oldfieldtype': 'Select',
 		'options': 'link:Currency',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:11',
 		'default': '1',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'conversion_rate',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 28,
-		'in_filter': None,
 		'label': 'Bill Conversion Rate',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02089',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'conversion_rate',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 29,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05514',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'entries',
 		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
 		'idx': 30,
-		'in_filter': None,
 		'label': 'Entries',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02072',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'entries',
 		'oldfieldtype': 'Table',
 		'options': 'PV Detail',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 31,
-		'in_filter': None,
 		'label': 'Recalculate',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02073',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
 		'description': 'Will be calculated automatically when you enter the details',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'net_total',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 32,
-		'in_filter': None,
 		'label': 'Net Total',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02074',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'net_total',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-28 10:26:05',
-		'default': None,
-		'depends_on': None,
 		'description': 'Add / Edit taxes and other charges',
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 33,
-		'in_filter': None,
 		'label': 'Taxes',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05515',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'purchase_other_charges',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 34,
-		'in_filter': None,
 		'label': 'Purchase Other Charges',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02078',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'purchase_other_charges',
 		'oldfieldtype': 'Link',
 		'options': 'Purchase Other Charges',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 35,
-		'in_filter': None,
 		'label': 'Get Tax Detail',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02079',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
 		'options': 'get_purchase_tax_details',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'purchase_tax_details',
 		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
 		'idx': 36,
-		'in_filter': None,
 		'label': 'Purchase Tax Details',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02080',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'purchase_tax_details',
 		'oldfieldtype': 'Table',
 		'options': 'Purchase Tax Detail',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 37,
-		'in_filter': None,
 		'label': 'Calculate Tax',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02081',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
 		'idx': 38,
-		'in_filter': None,
 		'label': 'Tax Calculation',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05516',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'HTML',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'total_tax',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 39,
-		'in_filter': None,
 		'label': 'Total Tax',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02083',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'total_tax',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 40,
-		'in_filter': None,
 		'label': 'More Info',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05517',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 41,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05518',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:11',
 		'default': 'No',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'is_opening',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 42,
 		'in_filter': 1,
 		'label': 'Is Opening',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02092',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'is_opening',
 		'oldfieldtype': 'Select',
 		'options': 'No\nYes',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
 		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:48:01',
-		'default': None,
-		'depends_on': None,
 		'description': 'Track this Purchase Invoice against any Project',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'project_name',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 43,
 		'in_filter': 1,
 		'label': 'Project Name',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL03778',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'project_name',
 		'oldfieldtype': 'Link',
 		'options': 'Project',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'aging_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 44,
-		'in_filter': None,
 		'label': 'Aging Date',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02093',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'aging_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
+		'search_index': 0
 	},
+
+	# DocField
 	{
 		'allow_on_submit': 1,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'select_print_heading',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 45,
-		'in_filter': None,
 		'label': 'Select Print Heading',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02098',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'select_print_heading',
 		'oldfieldtype': 'Link',
 		'options': 'Print Heading',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
 		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 46,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05519',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'company',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 47,
 		'in_filter': 1,
 		'label': 'Company',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02094',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'company',
 		'oldfieldtype': 'Link',
 		'options': 'Company',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'fiscal_year',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 48,
 		'in_filter': 1,
 		'label': 'Fiscal Year',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02095',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'fiscal_year',
 		'oldfieldtype': 'Select',
 		'options': 'link:Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'cancel_reason',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 49,
-		'in_filter': None,
 		'label': 'Cancel Reason',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02096',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'cancel_reason',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'remarks',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 50,
-		'in_filter': None,
 		'label': 'Remarks',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02090',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'remarks',
 		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 51,
-		'in_filter': None,
 		'label': 'Advances',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05520',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 52,
-		'in_filter': None,
 		'label': 'Get Advances Paid',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02100',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
 		'options': 'get_advances',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'advance_allocation_details',
 		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
 		'idx': 53,
-		'in_filter': None,
 		'label': 'Advance Allocation Details',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02101',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'advance_allocation_details',
 		'oldfieldtype': 'Table',
 		'options': 'Advance Allocation Detail',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 54,
-		'in_filter': None,
 		'label': 'TDS',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05521',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 55,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05522',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'tds_applicable',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 56,
-		'in_filter': None,
 		'label': 'TDS Applicable',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02103',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'tds_applicable',
 		'oldfieldtype': 'Select',
 		'options': '\nYes\nNo',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'tds_category',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 57,
-		'in_filter': None,
 		'label': 'TDS Category',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02104',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'tds_category',
 		'oldfieldtype': 'Select',
 		'options': 'link:TDS Category',
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 58,
-		'in_filter': None,
 		'label': 'Get TDS',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02105',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 59,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05523',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'tax_code',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 60,
-		'in_filter': None,
 		'label': 'TDS Account Head',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02106',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'tax_code',
 		'oldfieldtype': 'Link',
 		'options': 'Account',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'rate',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 61,
-		'in_filter': None,
 		'label': 'Rate',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02107',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'rate',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'ded_amount',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 62,
-		'in_filter': None,
 		'label': 'TDS Amount',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02108',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'ded_amount',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 63,
-		'in_filter': None,
 		'label': 'Totals',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05524',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 64,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05525',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'other_charges_added',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 65,
-		'in_filter': None,
 		'label': 'Other Charges Added',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02111',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'other_charges_added',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'other_charges_deducted',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 66,
-		'in_filter': None,
 		'label': 'Other Charges Deducted',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02112',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'other_charges_deducted',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'total_tds_on_voucher',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 67,
-		'in_filter': None,
 		'label': 'Total TDS On Voucher',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02113',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'total_tds_on_voucher',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'tds_amount_on_advance',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 68,
-		'in_filter': None,
 		'label': 'TDS Amount On Advance',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02114',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'tds_amount_on_advance',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'total_advance',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 69,
-		'in_filter': None,
 		'label': 'Total Advance (Incl. TDS)',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02115',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'total_advance',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'total_amount_to_pay',
 		'fieldtype': 'Currency',
 		'hidden': 0,
-		'icon': None,
 		'idx': 70,
-		'in_filter': None,
 		'label': 'Total Amount To Pay',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02116',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'total_amount_to_pay',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'outstanding_amount',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 71,
 		'in_filter': 1,
 		'label': 'Outstanding Amount',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02117',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'outstanding_amount',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-28 10:26:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 72,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05526',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'grand_total',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 73,
-		'in_filter': None,
 		'label': 'Grand Total',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02075',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'grand_total',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
 		'description': 'In Words will be visible once you save the Purchase Invoice.',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'in_words',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 74,
-		'in_filter': None,
 		'label': 'In Words',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02076',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'in_words',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'net_total_import',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 75,
-		'in_filter': None,
 		'label': 'Net Total (Import)',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02119',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'net_total_import',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'other_charges_added_import',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 76,
-		'in_filter': None,
 		'label': 'Other Charges Added (Import)',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02120',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'other_charges_added_import',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'other_charges_deducted_import',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 77,
-		'in_filter': None,
 		'label': 'Other Charges Deducted (Import)',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02121',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'other_charges_deducted_import',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'grand_total_import',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 78,
-		'in_filter': None,
 		'label': 'Grand Total (Import)',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02122',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'grand_total_import',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
 		'description': 'In Words (Import) will be visible once you save the Purchase Invoice.',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'in_words_import',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 79,
-		'in_filter': None,
 		'label': 'In Words (Import)',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02123',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'in_words_import',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-28 10:26:05',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 80,
-		'in_filter': None,
 		'label': 'Actions',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05527',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
 		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 81,
-		'in_filter': None,
 		'label': 'Repair Outstanding Amt',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02130',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
 		'options': 'repair_pv_outstanding',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'against_expense_account',
 		'fieldtype': 'Small Text',
 		'hidden': 1,
-		'icon': None,
 		'idx': 82,
-		'in_filter': None,
 		'label': 'Against Expense Account',
-		'modified': '2011-06-21 17:01:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02131',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'against_expense_account',
 		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Payable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': 0,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'report_hide': 0
 	}
 ]
\ No newline at end of file
diff --git a/accounts/doctype/period_closing_voucher/period_closing_voucher.txt b/accounts/doctype/period_closing_voucher/period_closing_voucher.txt
index 9704d08c0a..e5bb1a274a 100644
--- a/accounts/doctype/period_closing_voucher/period_closing_voucher.txt
+++ b/accounts/doctype/period_closing_voucher/period_closing_voucher.txt
@@ -1 +1,292 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-08-13 14:25:35', 'search_fields': 'posting_date, fiscal_year', 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'jai@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 121, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'PCE/.###', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': '', 'name': 'Period Closing Voucher', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-10-25 17:19:32', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 1, 'amend': 1, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM01120', 'parent': 'Period Closing Voucher', 'read': 1, 'create': 1, 'creation': '2010-08-13 14:25:35', 'modified': '2010-10-25 17:19:32', 'submit': 1, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM01226', 'parent': 'Period Closing Voucher', 'read': 1, 'create': 1, 'creation': '2010-10-22 17:27:59', 'modified': '2010-10-25 17:19:32', 'submit': 1, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'Accounts Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Column Break', 'creation': '2010-08-18 11:07:26', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': '', 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Period Closing Voucher', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05939', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-10-25 17:19:32', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-08-13 14:25:35', 'doctype': 'DocField', 'oldfieldname': 'transaction_date', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Transaction Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Period Closing Voucher', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05895', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-10-25 17:19:32', 'parenttype': 'DocType', 'fieldname': 'transaction_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-08-13 14:25:35', 'doctype': 'DocField', 'oldfieldname': 'posting_date', 'owner': 'jai@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Posting Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Period Closing Voucher', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05894', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-10-25 17:19:32', 'parenttype': 'DocType', 'fieldname': 'posting_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-08-13 14:29:39', 'doctype': 'DocField', 'oldfieldname': 'fiscal_year', 'owner': 'jai@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Closing Fiscal Year', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Period Closing Voucher', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05899', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-10-25 17:19:32', 'parenttype': 'DocType', 'fieldname': 'fiscal_year', 'fieldtype': 'Select', 'options': 'link:Fiscal Year', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-08-17 17:08:20', 'doctype': 'DocField', 'oldfieldname': 'amended_from', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Amended From', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Period Closing Voucher', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05923', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-10-25 17:19:32', 'parenttype': 'DocType', 'fieldname': 'amended_from', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-08-17 17:08:20', 'doctype': 'DocField', 'oldfieldname': 'amendment_date', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Amendment Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Period Closing Voucher', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05924', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-10-25 17:19:32', 'parenttype': 'DocType', 'fieldname': 'amendment_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-08-13 14:29:39', 'doctype': 'DocField', 'oldfieldname': 'company', 'owner': 'jai@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Company', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Period Closing Voucher', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05901', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-10-25 17:19:32', 'parenttype': 'DocType', 'fieldname': 'company', 'fieldtype': 'Select', 'options': 'link:Company', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Column Break', 'creation': '2010-08-18 11:03:44', 'doctype': 'DocField', 'oldfieldname': '', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Period Closing Voucher', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05936', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-10-25 17:19:32', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-08-13 14:25:35', 'doctype': 'DocField', 'oldfieldname': 'closing_account_head', 'owner': 'jai@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Closing Account Head', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Period Closing Voucher', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05897', 'idx': 9, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-25 17:19:32', 'parenttype': 'DocType', 'fieldname': 'closing_account_head', 'fieldtype': 'Link', 'options': 'Account', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'HTML', 'creation': '2010-10-14 08:21:03', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'CoA Help', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Period Closing Voucher', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06305', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-10-25 17:19:32', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': 'To create Account Head, click here', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-08-13 14:25:35', 'doctype': 'DocField', 'oldfieldname': 'remarks', 'owner': 'jai@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Remarks', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Period Closing Voucher', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05896', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-10-25 17:19:32', 'parenttype': 'DocType', 'fieldname': 'remarks', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-10-13 10:39:21', 'doctype': 'DocField', 'oldfieldname': 'cancel_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Cancel Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Period Closing Voucher', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL06291', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-10-25 17:19:32', 'parenttype': 'DocType', 'fieldname': 'cancel_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-08-18 11:03:44', 'doctype': 'DocField', 'oldfieldname': '', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Repost Account Balances', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Period Closing Voucher', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05937', 'idx': 13, 'default': None, 'colour': None, 'modified': '2010-10-25 17:19:32', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Section Break', 'options': 'Simple', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-08-13 14:29:39', 'doctype': 'DocField', 'oldfieldname': 'next_fiscal_year', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Fiscal Year (For Reposting)', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Period Closing Voucher', 'search_index': None, 'allow_on_submit': 1, 'icon': None, 'name': 'FL05900', 'idx': 14, 'default': None, 'colour': None, 'modified': '2010-10-25 17:19:32', 'parenttype': 'DocType', 'fieldname': 'next_fiscal_year', 'fieldtype': 'Select', 'options': 'link:Fiscal Year', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2010-08-13 14:29:39', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Repost', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Period Closing Voucher', 'search_index': None, 'allow_on_submit': 1, 'icon': None, 'name': 'FL05902', 'idx': 15, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-25 17:19:32', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'repost_account_balances', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Period Closing Voucher
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-10-25 17:25:22',
+		'docstatus': 0,
+		'modified': '2010-12-23 13:34:27',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'jai@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'PCE/.###',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'Accounts',
+		'name': '__common__',
+		'search_fields': 'posting_date, fiscal_year',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 121
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Period Closing Voucher',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Period Closing Voucher',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Period Closing Voucher
+	{
+		'doctype': 'DocType',
+		'name': 'Period Closing Voucher'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'permlevel': 1,
+		'role': 'Accounts Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'permlevel': 1,
+		'role': 'Accounts Manager'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Accounts Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 1,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'transaction_date',
+		'fieldtype': 'Date',
+		'idx': 2,
+		'label': 'Transaction Date',
+		'oldfieldname': 'transaction_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'posting_date',
+		'fieldtype': 'Date',
+		'idx': 3,
+		'label': 'Posting Date',
+		'oldfieldname': 'posting_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'label': 'Closing Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'idx': 5,
+		'label': 'Amended From',
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'idx': 6,
+		'label': 'Amendment Date',
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Select',
+		'idx': 7,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Select',
+		'options': 'link:Company',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 8,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'closing_account_head',
+		'fieldtype': 'Link',
+		'idx': 9,
+		'label': 'Closing Account Head',
+		'oldfieldname': 'closing_account_head',
+		'oldfieldtype': 'Link',
+		'options': 'Account',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 10,
+		'label': 'CoA Help',
+		'oldfieldtype': 'HTML',
+		'options': 'To create Account Head, click here',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'remarks',
+		'fieldtype': 'Small Text',
+		'idx': 11,
+		'label': 'Remarks',
+		'oldfieldname': 'remarks',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'cancel_reason',
+		'fieldtype': 'Small Text',
+		'hidden': 1,
+		'idx': 12,
+		'label': 'Cancel Reason',
+		'oldfieldname': 'cancel_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'print_hide': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 13,
+		'label': 'Repost Account Balances',
+		'oldfieldtype': 'Section Break',
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'next_fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 14,
+		'label': 'Fiscal Year (For Reposting)',
+		'oldfieldname': 'next_fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 15,
+		'label': 'Repost',
+		'oldfieldtype': 'Button',
+		'options': 'repost_account_balances',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/pos_setting/pos_setting.txt b/accounts/doctype/pos_setting/pos_setting.txt
index ab4b5f456a..7b1b9fa5a8 100755
--- a/accounts/doctype/pos_setting/pos_setting.txt
+++ b/accounts/doctype/pos_setting/pos_setting.txt
@@ -1 +1,300 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-12-08 15:18:11', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 27, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'POS/.####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': '', 'name': 'POS Setting', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-12-10 11:29:51', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00679', 'parent': 'POS Setting', 'read': 1, 'create': 1, 'creation': '2010-12-08 15:18:12', 'modified': '2010-12-10 11:29:51', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00680', 'parent': 'POS Setting', 'read': 1, 'create': 1, 'creation': '2010-12-08 15:18:12', 'modified': '2010-12-10 11:29:51', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'System Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00681', 'parent': 'POS Setting', 'read': 1, 'create': 1, 'creation': '2010-12-08 15:18:12', 'modified': '2010-12-10 11:29:51', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'Accounts Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00682', 'parent': 'POS Setting', 'read': 1, 'create': None, 'creation': '2010-12-08 15:18:12', 'modified': '2010-12-10 11:29:51', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 4, 'parenttype': 'DocType', 'role': 'Accounts User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-12-08 15:18:12', 'doctype': 'DocField', 'oldfieldname': 'user', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'User', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'POS Setting', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03825', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-12-10 11:29:51', 'parenttype': 'DocType', 'fieldname': 'user', 'fieldtype': 'Link', 'options': 'Profile', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-12-08 15:18:12', 'doctype': 'DocField', 'oldfieldname': 'territory', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Territory', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'POS Setting', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03826', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-12-10 11:29:51', 'parenttype': 'DocType', 'fieldname': 'territory', 'fieldtype': 'Link', 'options': 'Territory', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-12-08 15:18:12', 'doctype': 'DocField', 'oldfieldname': 'naming_series', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Series', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'POS Setting', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03827', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-12-10 11:29:51', 'parenttype': 'DocType', 'fieldname': 'naming_series', 'fieldtype': 'Select', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-12-08 15:18:12', 'doctype': 'DocField', 'oldfieldname': 'currency', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Currency', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'POS Setting', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03828', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-12-10 11:29:51', 'parenttype': 'DocType', 'fieldname': 'currency', 'fieldtype': 'Select', 'options': 'link:Currency', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-12-08 15:18:12', 'doctype': 'DocField', 'oldfieldname': 'conversion_rate', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Conversion Rate', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'POS Setting', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03829', 'idx': 5, 'default': '1.00', 'colour': 'White:FFF', 'modified': '2010-12-10 11:29:51', 'parenttype': 'DocType', 'fieldname': 'conversion_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-12-08 15:18:12', 'doctype': 'DocField', 'oldfieldname': 'price_list_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Price List', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'POS Setting', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03830', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-12-10 11:29:51', 'parenttype': 'DocType', 'fieldname': 'price_list_name', 'fieldtype': 'Select', 'options': 'link:Price List', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-12-08 15:18:12', 'doctype': 'DocField', 'oldfieldname': 'company', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Company', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'POS Setting', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03831', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-12-10 11:29:51', 'parenttype': 'DocType', 'fieldname': 'company', 'fieldtype': 'Link', 'options': 'Company', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Column Break', 'creation': '2010-12-08 15:18:12', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': None, 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'POS Setting', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03832', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-12-10 11:29:51', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-12-08 15:18:12', 'doctype': 'DocField', 'oldfieldname': 'customer_account', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Customer Account', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'POS Setting', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03833', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-12-10 11:29:51', 'parenttype': 'DocType', 'fieldname': 'customer_account', 'fieldtype': 'Link', 'options': 'Account', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-12-08 15:18:12', 'doctype': 'DocField', 'oldfieldname': 'cash_bank_account', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Cash/Bank Account', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'POS Setting', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03834', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-12-10 11:29:51', 'parenttype': 'DocType', 'fieldname': 'cash_bank_account', 'fieldtype': 'Link', 'options': 'Account', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-12-08 15:18:12', 'doctype': 'DocField', 'oldfieldname': 'income_account', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Income Account', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'POS Setting', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03835', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-12-10 11:29:51', 'parenttype': 'DocType', 'fieldname': 'income_account', 'fieldtype': 'Link', 'options': 'Account', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-12-09 17:46:11', 'doctype': 'DocField', 'oldfieldname': 'warehouse', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Warehouse', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'POS Setting', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03887', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-12-10 11:29:51', 'parenttype': 'DocType', 'fieldname': 'warehouse', 'fieldtype': 'Link', 'options': 'Warehouse', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-12-08 15:18:12', 'doctype': 'DocField', 'oldfieldname': 'cost_center', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Cost Center', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'POS Setting', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03836', 'idx': 13, 'default': None, 'colour': None, 'modified': '2010-12-10 11:29:51', 'parenttype': 'DocType', 'fieldname': 'cost_center', 'fieldtype': 'Link', 'options': 'Cost Center', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-12-08 15:18:12', 'doctype': 'DocField', 'oldfieldname': 'charge', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Charge', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'POS Setting', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03837', 'idx': 14, 'default': None, 'colour': None, 'modified': '2010-12-10 11:29:51', 'parenttype': 'DocType', 'fieldname': 'charge', 'fieldtype': 'Link', 'options': 'Other Charges', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-12-08 15:18:12', 'doctype': 'DocField', 'oldfieldname': 'letter_head', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Letter Head', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'POS Setting', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03838', 'idx': 15, 'default': None, 'colour': None, 'modified': '2010-12-10 11:29:51', 'parenttype': 'DocType', 'fieldname': 'letter_head', 'fieldtype': 'Select', 'options': 'link:Letter Head', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-12-08 15:18:12', 'doctype': 'DocField', 'oldfieldname': 'tc_name', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Terms', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'POS Setting', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03839', 'idx': 16, 'default': None, 'colour': None, 'modified': '2010-12-10 11:29:51', 'parenttype': 'DocType', 'fieldname': 'tc_name', 'fieldtype': 'Link', 'options': 'Term', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-12-08 15:18:12', 'doctype': 'DocField', 'oldfieldname': 'select_print_heading', 'owner': 'Administrator', 'reqd': None, 'in_filter': 0, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Select Print Heading', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'POS Setting', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03840', 'idx': 17, 'default': None, 'colour': None, 'modified': '2010-12-10 11:29:51', 'parenttype': 'DocType', 'fieldname': 'select_print_heading', 'fieldtype': 'Select', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, POS Setting
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-12-15 08:39:23',
+		'docstatus': 0,
+		'modified': '2010-12-10 11:29:51',
+		'modified_by': 'rahul@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'POS/.####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 27
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'POS Setting',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'POS Setting',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1
+	},
+
+	# DocType, POS Setting
+	{
+		'doctype': 'DocType',
+		'name': 'POS Setting'
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'System Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'role': 'Accounts Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'role': 'Accounts User'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'user',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'User',
+		'oldfieldname': 'user',
+		'oldfieldtype': 'Link',
+		'options': 'Profile'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'territory',
+		'fieldtype': 'Link',
+		'idx': 2,
+		'label': 'Territory',
+		'oldfieldname': 'territory',
+		'oldfieldtype': 'Link',
+		'options': 'Territory',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'naming_series',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Series',
+		'no_copy': 1,
+		'oldfieldname': 'naming_series',
+		'oldfieldtype': 'Select',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'currency',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'label': 'Currency',
+		'oldfieldname': 'currency',
+		'oldfieldtype': 'Select',
+		'options': 'link:Currency',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': '1.00',
+		'doctype': 'DocField',
+		'fieldname': 'conversion_rate',
+		'fieldtype': 'Currency',
+		'idx': 5,
+		'label': 'Conversion Rate',
+		'oldfieldname': 'conversion_rate',
+		'oldfieldtype': 'Currency',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'price_list_name',
+		'fieldtype': 'Select',
+		'idx': 6,
+		'label': 'Price List',
+		'oldfieldname': 'price_list_name',
+		'oldfieldtype': 'Select',
+		'options': 'link:Price List',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 7,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 8,
+		'oldfieldtype': 'Column Break'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_account',
+		'fieldtype': 'Link',
+		'idx': 9,
+		'label': 'Customer Account',
+		'oldfieldname': 'customer_account',
+		'oldfieldtype': 'Link',
+		'options': 'Account',
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'cash_bank_account',
+		'fieldtype': 'Link',
+		'idx': 10,
+		'label': 'Cash/Bank Account',
+		'oldfieldname': 'cash_bank_account',
+		'oldfieldtype': 'Link',
+		'options': 'Account',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'income_account',
+		'fieldtype': 'Link',
+		'idx': 11,
+		'label': 'Income Account',
+		'oldfieldname': 'income_account',
+		'oldfieldtype': 'Link',
+		'options': 'Account',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'warehouse',
+		'fieldtype': 'Link',
+		'idx': 12,
+		'label': 'Warehouse',
+		'oldfieldname': 'warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'cost_center',
+		'fieldtype': 'Link',
+		'idx': 13,
+		'label': 'Cost Center',
+		'oldfieldname': 'cost_center',
+		'oldfieldtype': 'Link',
+		'options': 'Cost Center',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'charge',
+		'fieldtype': 'Link',
+		'idx': 14,
+		'label': 'Charge',
+		'oldfieldname': 'charge',
+		'oldfieldtype': 'Link',
+		'options': 'Other Charges'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'letter_head',
+		'fieldtype': 'Select',
+		'idx': 15,
+		'label': 'Letter Head',
+		'oldfieldname': 'letter_head',
+		'oldfieldtype': 'Select',
+		'options': 'link:Letter Head',
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tc_name',
+		'fieldtype': 'Link',
+		'idx': 16,
+		'label': 'Terms',
+		'oldfieldname': 'tc_name',
+		'oldfieldtype': 'Link',
+		'options': 'Term'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'select_print_heading',
+		'fieldtype': 'Select',
+		'idx': 17,
+		'in_filter': 0,
+		'label': 'Select Print Heading',
+		'oldfieldname': 'select_print_heading',
+		'oldfieldtype': 'Select',
+		'options': 'link:Print Heading'
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/purchase_tax_detail/purchase_tax_detail.txt b/accounts/doctype/purchase_tax_detail/purchase_tax_detail.txt
index d3b61f582f..583a97f260 100644
--- a/accounts/doctype/purchase_tax_detail/purchase_tax_detail.txt
+++ b/accounts/doctype/purchase_tax_detail/purchase_tax_detail.txt
@@ -1 +1,246 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2010-01-28 11:36:28', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'wasim@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': 1, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 10, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': 'PVTD.######', 'client_script_core': '', 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Purchase Tax Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': '', 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-01-28 11:39:20', 'doctype': 'DocField', 'oldfieldname': 'category', 'owner': 'wasim@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Category', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03870', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-06-28 11:16:28', 'parenttype': 'DocType', 'fieldname': 'category', 'fieldtype': 'Select', 'options': '\nFor Total\nFor Valuation\nFor Both', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-02-03 11:52:23', 'doctype': 'DocField', 'oldfieldname': 'add_deduct_tax', 'owner': 'wasim@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Add or Deduct', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03919', 'idx': 2, 'default': 'Add', 'colour': None, 'modified': '2010-06-28 11:16:28', 'parenttype': 'DocType', 'fieldname': 'add_deduct_tax', 'fieldtype': 'Select', 'options': '\nAdd\nDeduct', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-01-28 11:36:28', 'doctype': 'DocField', 'oldfieldname': 'charge_type', 'owner': 'wasim@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Type', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03859', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-06-28 11:16:28', 'parenttype': 'DocType', 'fieldname': 'charge_type', 'fieldtype': 'Select', 'options': '\nActual\nOn Net Total\nOn Previous Row Amount\nOn Previous Row Total', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-01-28 11:36:28', 'doctype': 'DocField', 'oldfieldname': 'row_id', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Enter Row', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 0, 'description': None, 'parent': 'Purchase Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03860', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-06-28 11:16:28', 'parenttype': 'DocType', 'fieldname': 'row_id', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-01-28 11:36:28', 'doctype': 'DocField', 'oldfieldname': 'item_wise_tax_detail', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Item Wise Tax Detail ', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Purchase Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03861', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-06-28 11:16:28', 'parenttype': 'DocType', 'fieldname': 'item_wise_tax_detail', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-01-28 11:36:28', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'wasim@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Description', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03862', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-06-28 11:16:28', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-01-28 11:36:28', 'doctype': 'DocField', 'oldfieldname': 'account_head', 'owner': 'wasim@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Account Head', 'width': '', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03863', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-06-28 11:16:28', 'parenttype': 'DocType', 'fieldname': 'account_head', 'fieldtype': 'Link', 'options': 'Account', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-02-04 12:49:54', 'doctype': 'DocField', 'oldfieldname': 'cost_center', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Cost Center', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03945', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-06-28 11:16:28', 'parenttype': 'DocType', 'fieldname': 'cost_center', 'fieldtype': 'Link', 'options': 'Cost Center', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-28 11:36:28', 'doctype': 'DocField', 'oldfieldname': 'rate', 'owner': 'wasim@webnotestech.com', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Rate', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03864', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-06-28 11:16:28', 'parenttype': 'DocType', 'fieldname': 'rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-28 11:36:28', 'doctype': 'DocField', 'oldfieldname': 'tax_amount', 'owner': 'wasim@webnotestech.com', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Amount', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03865', 'idx': 10, 'default': '', 'colour': None, 'modified': '2010-06-28 11:16:28', 'parenttype': 'DocType', 'fieldname': 'tax_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-28 11:36:28', 'doctype': 'DocField', 'oldfieldname': 'total', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Aggregate Total', 'width': '', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Purchase Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03866', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-06-28 11:16:28', 'parenttype': 'DocType', 'fieldname': 'total', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-01-28 11:36:28', 'doctype': 'DocField', 'oldfieldname': 'parenttype', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Parenttype', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Purchase Tax Detail', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL03867', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-06-28 11:16:28', 'parenttype': 'DocType', 'fieldname': 'parenttype', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Currency', 'creation': '2010-01-28 11:36:28', 'doctype': 'DocField', 'oldfieldname': 'total_tax_amount', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Total +Tax', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': 'Cheating Field\nPlease do not delete ', 'parent': 'Purchase Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03868', 'idx': 13, 'default': None, 'colour': None, 'modified': '2010-06-28 11:16:28', 'parenttype': 'DocType', 'fieldname': 'total_tax_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Currency', 'creation': '2010-01-28 11:36:28', 'doctype': 'DocField', 'oldfieldname': 'total_amount', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Tax Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': 'Cheating Field\nPlease do not delete ', 'parent': 'Purchase Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03869', 'idx': 14, 'default': None, 'colour': None, 'modified': '2010-06-28 11:16:28', 'parenttype': 'DocType', 'fieldname': 'total_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Purchase Tax Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:16',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'wasim@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'PVTD.######',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'hide_heading': 1,
+		'istable': 1,
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 10
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Purchase Tax Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Purchase Tax Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Purchase Tax Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'category',
+		'fieldtype': 'Select',
+		'idx': 1,
+		'label': 'Category',
+		'oldfieldname': 'category',
+		'oldfieldtype': 'Select',
+		'options': '\nFor Total\nFor Valuation\nFor Both',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'default': 'Add',
+		'doctype': 'DocField',
+		'fieldname': 'add_deduct_tax',
+		'fieldtype': 'Select',
+		'idx': 2,
+		'label': 'Add or Deduct',
+		'oldfieldname': 'add_deduct_tax',
+		'oldfieldtype': 'Select',
+		'options': '\nAdd\nDeduct',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'charge_type',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Type',
+		'oldfieldname': 'charge_type',
+		'oldfieldtype': 'Select',
+		'options': '\nActual\nOn Net Total\nOn Previous Row Amount\nOn Previous Row Total',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'row_id',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 4,
+		'label': 'Enter Row',
+		'oldfieldname': 'row_id',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_wise_tax_detail',
+		'fieldtype': 'Small Text',
+		'idx': 5,
+		'label': 'Item Wise Tax Detail ',
+		'oldfieldname': 'item_wise_tax_detail',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Small Text',
+		'idx': 6,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'reqd': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'account_head',
+		'fieldtype': 'Link',
+		'idx': 7,
+		'label': 'Account Head',
+		'oldfieldname': 'account_head',
+		'oldfieldtype': 'Link',
+		'options': 'Account',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'cost_center',
+		'fieldtype': 'Link',
+		'idx': 8,
+		'label': 'Cost Center',
+		'oldfieldname': 'cost_center',
+		'oldfieldtype': 'Link',
+		'options': 'Cost Center',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rate',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'label': 'Rate',
+		'oldfieldname': 'rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tax_amount',
+		'fieldtype': 'Currency',
+		'idx': 10,
+		'label': 'Amount',
+		'oldfieldname': 'tax_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'total',
+		'fieldtype': 'Currency',
+		'idx': 11,
+		'label': 'Aggregate Total',
+		'oldfieldname': 'total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'parenttype',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 12,
+		'in_filter': 1,
+		'label': 'Parenttype',
+		'oldfieldname': 'parenttype',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'description': 'Cheating Field\nPlease do not delete ',
+		'doctype': 'DocField',
+		'fieldname': 'total_tax_amount',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 13,
+		'label': 'Total +Tax',
+		'no_copy': 1,
+		'oldfieldname': 'total_tax_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'description': 'Cheating Field\nPlease do not delete ',
+		'doctype': 'DocField',
+		'fieldname': 'total_amount',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 14,
+		'label': 'Tax Amount',
+		'no_copy': 1,
+		'oldfieldname': 'total_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/pv_add_tax_detail/pv_add_tax_detail.txt b/accounts/doctype/pv_add_tax_detail/pv_add_tax_detail.txt
deleted file mode 100644
index 9d474be4ea..0000000000
--- a/accounts/doctype/pv_add_tax_detail/pv_add_tax_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-03-12 12:09:22', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 1, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': 'EXPTD.######', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'PV Add Tax Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:09:22', 'doctype': 'DocField', 'oldfieldname': 'add_tax_code', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Tax Code', 'width': '200px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PV Add Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00442', 'idx': 1, 'default': None, 'colour': None, 'modified': '2009-07-09 14:29:26', 'parenttype': 'DocType', 'fieldname': 'add_tax_code', 'fieldtype': 'Link', 'options': 'Account', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-04-23 11:13:34', 'doctype': 'DocField', 'oldfieldname': 'cost_center', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Cost Center', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PV Add Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01926', 'idx': 2, 'default': None, 'colour': None, 'modified': '2009-07-09 14:29:26', 'parenttype': 'DocType', 'fieldname': 'cost_center', 'fieldtype': 'Link', 'options': 'Cost Center', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:09:22', 'doctype': 'DocField', 'oldfieldname': 'add_tax_rate', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Rate', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PV Add Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00443', 'idx': 3, 'default': None, 'colour': None, 'modified': '2009-07-09 14:29:26', 'parenttype': 'DocType', 'fieldname': 'add_tax_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:09:22', 'doctype': 'DocField', 'oldfieldname': 'add_amount', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Amount', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PV Add Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00444', 'idx': 4, 'default': None, 'colour': None, 'modified': '2009-07-09 14:29:26', 'parenttype': 'DocType', 'fieldname': 'add_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/accounts/doctype/pv_ded_tax_detail/pv_ded_tax_detail.txt b/accounts/doctype/pv_ded_tax_detail/pv_ded_tax_detail.txt
deleted file mode 100644
index 312256a089..0000000000
--- a/accounts/doctype/pv_ded_tax_detail/pv_ded_tax_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-03-12 12:09:22', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 4, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': 'TDD.######', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'nabin@webnotestech.com', 'document_type': None, 'name': 'PV Ded Tax Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-05-25 16:21:06', 'doctype': 'DocField', 'oldfieldname': 'tds_type', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'TDS Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PV Ded Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02152', 'idx': 1, 'default': None, 'colour': None, 'modified': '2009-12-15 12:02:13', 'parenttype': 'DocType', 'fieldname': 'tds_type', 'fieldtype': 'Select', 'options': '\nMain\nSurcharge\nEdu Cess\nSH Edu Cess\nNot Applicable', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:09:22', 'doctype': 'DocField', 'oldfieldname': 'tax_code', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Tax Code', 'width': '200px', 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PV Ded Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00445', 'idx': 2, 'default': None, 'colour': None, 'modified': '2009-12-15 12:02:13', 'parenttype': 'DocType', 'fieldname': 'tax_code', 'fieldtype': 'Link', 'options': 'Account', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Float', 'creation': '2009-03-12 12:09:22', 'doctype': 'DocField', 'oldfieldname': 'tax_rate', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Rate', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PV Ded Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00446', 'idx': 3, 'default': None, 'colour': None, 'modified': '2009-12-15 12:02:13', 'parenttype': 'DocType', 'fieldname': 'tax_rate', 'fieldtype': 'Float', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:09:22', 'doctype': 'DocField', 'oldfieldname': 'ded_amount', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Amount', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PV Ded Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00447', 'idx': 4, 'default': None, 'colour': None, 'modified': '2009-12-15 12:02:13', 'parenttype': 'DocType', 'fieldname': 'ded_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/accounts/doctype/pv_detail/pv_detail.txt b/accounts/doctype/pv_detail/pv_detail.txt
index 32b6076bbb..0243d71bbe 100644
--- a/accounts/doctype/pv_detail/pv_detail.txt
+++ b/accounts/doctype/pv_detail/pv_detail.txt
@@ -1,686 +1,316 @@
+# DocType, PV Detail
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'EVD.######',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
 		'creation': '2010-08-08 17:09:17',
-		'description': None,
 		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': 1,
-		'max_attachments': None,
-		'menu_index': None,
 		'modified': '2011-03-30 11:23:38',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'EVD.######',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
 		'module': 'Accounts',
-		'name': 'PV Detail',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
+		'name': '__common__',
 		'section_style': 'Tray',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
 		'version': 26
 	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'PV Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, PV Detail
+	{
+		'doctype': 'DocType',
+		'name': 'PV Detail'
+	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'item_code',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 1,
 		'in_filter': 1,
 		'label': 'Item',
-		'modified': '2011-05-09 11:04:22',
-		'modified_by': 'Administrator',
-		'name': 'FL02571',
-		'no_copy': None,
 		'oldfieldname': 'item_code',
 		'oldfieldtype': 'Link',
 		'options': 'Item',
-		'owner': 'Administrator',
-		'parent': 'PV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
 		'reqd': 0,
 		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'item_name',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
 		'in_filter': 0,
 		'label': 'Item Name',
-		'modified': '2011-05-09 11:04:22',
-		'modified_by': 'Administrator',
-		'name': 'FL02572',
-		'no_copy': None,
 		'oldfieldname': 'item_name',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'PV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
+		'search_index': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'brand',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
-		'in_filter': None,
 		'label': 'Brand',
-		'modified': '2011-05-09 11:04:22',
-		'modified_by': 'Administrator',
-		'name': 'FL02573',
-		'no_copy': None,
 		'oldfieldname': 'brand',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'PV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'description',
 		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 4,
-		'in_filter': None,
 		'label': 'Description',
-		'modified': '2011-05-09 11:04:22',
-		'modified_by': 'Administrator',
-		'name': 'FL02574',
-		'no_copy': None,
 		'oldfieldname': 'description',
 		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'PV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '200px'
+		'width': '300px'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'item_group',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 5,
 		'in_filter': 1,
 		'label': 'Item Group',
-		'modified': '2011-05-09 11:04:22',
-		'modified_by': 'Administrator',
-		'name': 'FL02575',
-		'no_copy': None,
 		'oldfieldname': 'item_group',
 		'oldfieldtype': 'Link',
 		'options': 'Item Group',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'PV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'rate',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 6,
-		'in_filter': None,
 		'label': 'Rate (Default Curr.)',
-		'modified': '2011-05-09 11:04:22',
-		'modified_by': 'Administrator',
-		'name': 'FL02576',
-		'no_copy': None,
 		'oldfieldname': 'rate',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'PV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'import_rate',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 7,
-		'in_filter': None,
 		'label': 'Rate',
-		'modified': '2011-05-09 11:04:22',
-		'modified_by': 'Administrator',
-		'name': 'FL02578',
-		'no_copy': None,
 		'oldfieldname': 'import_rate',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'PV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 0,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'qty',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 8,
-		'in_filter': None,
 		'label': 'Qty',
-		'modified': '2011-05-09 11:04:22',
-		'modified_by': 'Administrator',
-		'name': 'FL02577',
-		'no_copy': None,
 		'oldfieldname': 'qty',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'PV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 0,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'amount',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 9,
-		'in_filter': None,
 		'label': 'Amount (Default Curr.)',
-		'modified': '2011-05-09 11:04:22',
-		'modified_by': 'Administrator',
-		'name': 'FL02579',
-		'no_copy': None,
 		'oldfieldname': 'amount',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'PV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'import_amount',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 10,
-		'in_filter': None,
 		'label': 'Amount',
-		'modified': '2011-05-09 11:04:22',
-		'modified_by': 'Administrator',
-		'name': 'FL02580',
-		'no_copy': None,
 		'oldfieldname': 'import_amount',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'PV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'expense_head',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 11,
-		'in_filter': None,
 		'label': 'Expense Head',
-		'modified': '2011-05-09 11:04:22',
-		'modified_by': 'Administrator',
-		'name': 'FL02581',
-		'no_copy': None,
 		'oldfieldname': 'expense_head',
 		'oldfieldtype': 'Link',
 		'options': 'Account',
-		'owner': 'Administrator',
-		'parent': 'PV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': None,
 		'trigger': 'Client',
 		'width': '120px'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'cost_center',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 12,
-		'in_filter': None,
 		'label': 'Cost Center',
-		'modified': '2011-05-09 11:04:22',
-		'modified_by': 'Administrator',
-		'name': 'FL02582',
-		'no_copy': None,
 		'oldfieldname': 'cost_center',
 		'oldfieldtype': 'Link',
 		'options': 'Cost Center',
-		'owner': 'Administrator',
-		'parent': 'PV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
 		'trigger': 'Client',
 		'width': '120px'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'purchase_order',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 13,
 		'in_filter': 1,
 		'label': 'Pur Order',
-		'modified': '2011-05-09 11:04:22',
-		'modified_by': 'Administrator',
-		'name': 'FL02583',
-		'no_copy': None,
 		'oldfieldname': 'purchase_order',
 		'oldfieldtype': 'Link',
 		'options': 'Purchase Order',
-		'owner': 'Administrator',
-		'parent': 'PV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'po_detail',
 		'fieldtype': 'Data',
 		'hidden': 1,
-		'icon': None,
 		'idx': 14,
 		'in_filter': 1,
 		'label': 'PO Detail',
-		'modified': '2011-05-09 11:04:22',
-		'modified_by': 'Administrator',
-		'name': 'FL02584',
-		'no_copy': None,
 		'oldfieldname': 'po_detail',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'PV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'purchase_receipt',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 15,
 		'in_filter': 1,
 		'label': 'Pur Receipt',
-		'modified': '2011-05-09 11:04:22',
-		'modified_by': 'Administrator',
-		'name': 'FL02585',
-		'no_copy': None,
 		'oldfieldname': 'purchase_receipt',
 		'oldfieldtype': 'Link',
 		'options': 'Purchase Receipt',
-		'owner': 'Administrator',
-		'parent': 'PV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'pr_detail',
 		'fieldtype': 'Data',
 		'hidden': 1,
-		'icon': None,
 		'idx': 16,
 		'in_filter': 1,
 		'label': 'PR Detail',
-		'modified': '2011-05-09 11:04:22',
-		'modified_by': 'Administrator',
-		'name': 'FL02586',
-		'no_copy': None,
 		'oldfieldname': 'pr_detail',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'PV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
 		'description': 'Tax detail table fetched from item master as a string and stored in this field.\nUsed for Purchase Other Charges',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'item_tax_rate',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 17,
-		'in_filter': None,
 		'label': 'Item Tax Rate',
-		'modified': '2011-05-09 11:04:22',
-		'modified_by': 'Administrator',
-		'name': 'FL02587',
-		'no_copy': None,
 		'oldfieldname': 'item_tax_rate',
 		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'PV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'report_hide': 1
 	},
+
+	# DocField
 	{
 		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2011-05-09 11:04:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'page_break',
 		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
 		'idx': 18,
-		'in_filter': None,
 		'label': 'Page Break',
-		'modified': '2011-05-09 11:04:22',
-		'modified_by': 'Administrator',
-		'name': '000000371',
 		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'PV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'report_hide': 1
 	}
 ]
\ No newline at end of file
diff --git a/accounts/doctype/receivable_voucher/receivable_voucher.txt b/accounts/doctype/receivable_voucher/receivable_voucher.txt
index e3895733ae..bcad9cc31c 100644
--- a/accounts/doctype/receivable_voucher/receivable_voucher.txt
+++ b/accounts/doctype/receivable_voucher/receivable_voucher.txt
@@ -1,3640 +1,1418 @@
+# DocType, Receivable Voucher
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': '1305629437',
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': '1. Change in pull_details method dt.-26-06-2009',
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
 		'creation': '2010-08-08 17:09:18',
-		'description': None,
 		'docstatus': 0,
+		'modified': '2011-06-20 13:02:04',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308741898',
+		'change_log': '1. Change in pull_details method dt.-26-06-2009',
+		'colour': 'White:FFF',
 		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-17 16:20:36',
-		'modified_by': 'Guest',
 		'module': 'Accounts',
-		'name': 'Receivable Voucher',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
+		'name': '__common__',
 		'read_only_onload': 1,
 		'search_fields': 'posting_date, due_date, debit_to, fiscal_year, grand_total, outstanding_amount',
 		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
 		'subject': 'To %(customer_name)s worth %(currency)s %(grand_total_export)s due on %(due_date)s | %(outstanding_amount)s outstanding',
-		'tag_fields': None,
-		'use_template': None,
 		'version': 356
 	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Receivable Voucher',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Receivable Voucher',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Receivable Voucher
+	{
+		'doctype': 'DocType',
+		'name': 'Receivable Voucher'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Accounts Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
 	{
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2011-03-07 17:20:31',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-03-10 14:39:44',
-		'modified_by': 'Administrator',
-		'name': 'PERM00864',
-		'owner': 'umair@iwebnotes.com',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'idx': 2,
 		'permlevel': 0,
-		'read': 1,
-		'role': 'testrole',
+		'role': 'Accounts Manager',
 		'submit': 1,
 		'write': 1
 	},
+
+	# DocPerm
 	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2011-03-07 17:20:53',
-		'docstatus': 0,
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
 		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-03-10 14:39:44',
-		'modified_by': 'Administrator',
-		'name': 'PERM00865',
-		'owner': 'umair@iwebnotes.com',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'testrole',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:18',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 3,
-		'match': None,
-		'modified': '2011-03-10 14:39:44',
-		'modified_by': 'Administrator',
-		'name': 'PERM00446',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Accounts Manager',
-		'submit': 0,
-		'write': 0
+		'permlevel': 0,
+		'role': 'Accounts User',
+		'submit': 1,
+		'write': 1
 	},
+
+	# DocPerm
 	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:18',
-		'docstatus': 0,
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 4,
-		'match': None,
-		'modified': '2011-03-10 14:39:44',
-		'modified_by': 'Administrator',
-		'name': 'PERM00447',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Accounts Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:18',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2011-03-10 14:39:44',
-		'modified_by': 'Administrator',
-		'name': 'PERM00448',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Accounts User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:18',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2011-03-10 14:39:44',
-		'modified_by': 'Administrator',
-		'name': 'PERM00449',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'read': 1,
 		'role': 'Accounts User',
 		'submit': 0,
 		'write': 0
 	},
+
+	# DocPerm
 	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:18',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 7,
-		'match': None,
-		'modified': '2011-03-10 14:39:44',
-		'modified_by': 'Administrator',
-		'name': 'PERM00450',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'idx': 5,
+		'match': 'customer',
 		'permlevel': 0,
-		'read': 1,
-		'role': 'Customer',
-		'submit': 0,
-		'write': 0
+		'role': 'Customer'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 1,
-		'in_filter': None,
 		'label': 'Basic Info',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05333',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05334',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
-		'default': 'INV',
 		'depends_on': 'eval:doc.retail_transaction!="Yes"',
 		'description': 'To manage multiple series please go to Setup > Manage Series',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'naming_series',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
-		'in_filter': None,
 		'label': 'Series',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02753',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'naming_series',
 		'oldfieldtype': 'Select',
 		'options': '\nINV\nINV/10-11/',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-15 08:39:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'is_pos',
 		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
 		'idx': 4,
-		'in_filter': None,
 		'label': 'Is POS',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL04339',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'is_pos',
 		'oldfieldtype': 'Check',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-15 08:39:22',
 		'default': '1',
 		'depends_on': 'eval:doc.is_pos==1',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'update_stock',
 		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
 		'idx': 5,
-		'in_filter': None,
 		'label': 'Update Stock',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL04340',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'update_stock',
 		'oldfieldtype': 'Check',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
 		'description': 'The account to which you will pay (have paid) the money to.',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'debit_to',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 6,
 		'in_filter': 1,
 		'label': 'Debit To',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02748',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'debit_to',
 		'oldfieldtype': 'Link',
 		'options': 'Account',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
+		'print_hide': 1,
 		'reqd': 1,
 		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'customer',
 		'fieldtype': 'Link',
 		'hidden': 0,
-		'icon': None,
 		'idx': 7,
-		'in_filter': None,
 		'label': 'Customer',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02749',
-		'no_column': None,
 		'no_copy': 0,
 		'oldfieldname': 'customer',
 		'oldfieldtype': 'Link',
 		'options': 'Customer',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'customer_address',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 8,
-		'in_filter': None,
 		'label': 'Customer Address',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02750',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
+		'options': 'Address',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:14',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'contact_person',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 9,
-		'in_filter': None,
 		'label': 'Contact Person',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL05316',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'Contact',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'customer_name',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 10,
-		'in_filter': None,
 		'label': 'Name',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL03780',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'customer_name',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:14',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'address_display',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 11,
-		'in_filter': None,
 		'label': 'Address',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL05317',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:14',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'contact_display',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 12,
-		'in_filter': None,
 		'label': 'Contact',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL05318',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:14',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'contact_mobile',
 		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 13,
-		'in_filter': None,
 		'label': 'Mobile No',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL05319',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:14',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'contact_email',
 		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 14,
-		'in_filter': None,
 		'label': 'Contact Email',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL05320',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 15,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05335',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
 		'default': 'Today',
-		'depends_on': None,
 		'description': "This is the date on which this voucher is made in the system. Today's date comes by default.",
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'voucher_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 16,
 		'in_filter': 1,
 		'label': 'Voucher Date',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02754',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'voucher_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
 		'default': 'Today',
-		'depends_on': None,
 		'description': 'Enter the date by which payments from customer is expected against this invoice.',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'due_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 17,
 		'in_filter': 1,
 		'label': 'Due Date',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02755',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'due_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
 		'default': 'Today',
-		'depends_on': None,
 		'description': 'The date at which current entry will get or has actually executed.',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'posting_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 18,
 		'in_filter': 1,
 		'label': 'Posting Date',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02756',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'posting_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-15 08:39:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'posting_time',
 		'fieldtype': 'Time',
-		'hidden': None,
-		'icon': None,
 		'idx': 19,
-		'in_filter': None,
 		'label': 'Posting Time',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL04342',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'posting_time',
 		'oldfieldtype': 'Time',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
 		'description': 'The date at which current entry is corrected in the system.',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'amendment_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 20,
-		'in_filter': None,
 		'label': 'Amendment Date',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02757',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'amendment_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'amended_from',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 21,
-		'in_filter': None,
 		'label': 'Amended From',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02760',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'amended_from',
 		'oldfieldtype': 'Link',
 		'options': 'Receivable Voucher',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'mode_of_payment',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 22,
-		'in_filter': None,
 		'label': 'Mode of Payment',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02795',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'mode_of_payment',
 		'oldfieldtype': 'Select',
 		'options': 'link:Mode of Payment',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'territory',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 23,
 		'in_filter': 1,
 		'label': 'Territory',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02751',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'Territory',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:14',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'customer_group',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 24,
 		'in_filter': 1,
 		'label': 'Customer Group',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL05322',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'Customer Group',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 25,
-		'in_filter': None,
 		'label': 'Items',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05336',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'price_list_name',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 26,
-		'in_filter': None,
 		'label': 'Price List',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02784',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'price_list_name',
 		'oldfieldtype': 'Select',
 		'options': 'link:Price List',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
 		'description': 'Select Items from Sales Order',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'sales_order_main',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 27,
-		'in_filter': None,
 		'label': 'Sales Order',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02762',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'sales_order_main',
 		'oldfieldtype': 'Link',
 		'options': 'Sales Order',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
 		'description': 'Select Items from Delivery Note',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'delivery_note_main',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 28,
-		'in_filter': None,
 		'label': 'Delivery Note',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02763',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'delivery_note_main',
 		'oldfieldtype': 'Link',
 		'options': 'Delivery Note',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 29,
-		'in_filter': None,
 		'label': 'Get Items',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02764',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 30,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05337',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'currency',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 31,
-		'in_filter': None,
 		'label': 'Currency',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02758',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'currency',
 		'oldfieldtype': 'Select',
 		'options': 'link:Currency',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
 		'default': '1.00',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'conversion_rate',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 32,
-		'in_filter': None,
 		'label': 'Conversion Rate',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02759',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'conversion_rate',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 33,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05338',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
 		'allow_on_submit': 1,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'entries',
 		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
 		'idx': 34,
-		'in_filter': None,
 		'label': 'Entries',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02765',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'entries',
 		'oldfieldtype': 'Table',
 		'options': 'RV Detail',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 35,
-		'in_filter': None,
 		'label': 'Re-Calculate Values',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02766',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
 		'description': 'Will be calculated automatically when you enter the details',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'net_total',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 36,
-		'in_filter': None,
 		'label': 'Net Total*',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02767',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'net_total',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
 		'idx': 37,
-		'in_filter': None,
 		'label': 'Rates HTML',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05339',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'HTML',
 		'options': '* Rates in standard currency',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 38,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05340',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-12-15 08:39:22',
-		'default': None,
 		'depends_on': 'eval:doc.is_pos==1',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'cash_bank_account',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 39,
-		'in_filter': None,
 		'label': 'Cash/Bank Account',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL04341',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'cash_bank_account',
 		'oldfieldtype': 'Link',
 		'options': 'Account',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-12-15 08:39:22',
-		'default': None,
 		'depends_on': 'eval:doc.is_pos==1',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'paid_amount',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 40,
-		'in_filter': None,
 		'label': 'Paid Amount',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL04343',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'paid_amount',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'print_hide': 1,
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 41,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05341',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-10 12:58:07',
-		'default': None,
 		'depends_on': 'eval:doc.is_pos==1',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'write_off_account',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 42,
-		'in_filter': None,
 		'label': 'Write Off Account',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': '000002962',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'Account',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-10 12:58:07',
-		'default': None,
 		'depends_on': 'eval:doc.is_pos==1',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'write_off_cost_center',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 43,
-		'in_filter': None,
 		'label': 'Write Off Cost Center',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': '000002963',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'Cost Center',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-10 12:58:07',
-		'default': None,
 		'depends_on': 'eval:doc.is_pos==1',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'write_off_amount',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 44,
-		'in_filter': None,
 		'label': 'Write Off Amount',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': '000002964',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 45,
-		'in_filter': None,
 		'label': 'Taxes',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05342',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'charge',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 46,
-		'in_filter': None,
 		'label': 'Charge',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02771',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'charge',
 		'oldfieldtype': 'Link',
 		'options': 'Other Charges',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 47,
-		'in_filter': None,
 		'label': 'Get Charges',
-		'modified': '2011-05-25 12:45:14',
-		'modified_by': 'Guest',
-		'name': 'FL02772',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
 		'allow_on_submit': 1,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'other_charges',
 		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
 		'idx': 48,
-		'in_filter': None,
 		'label': 'Taxes1',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02773',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'other_charges',
 		'oldfieldtype': 'Table',
 		'options': 'RV Tax Detail',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'other_charges_total',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 49,
-		'in_filter': None,
 		'label': 'Total Charges',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02774',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'other_charges_total',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 50,
-		'in_filter': None,
 		'label': 'Calculate Charges',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02775',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
 		'idx': 51,
-		'in_filter': None,
 		'label': 'Other Charges Calculation',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05343',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'HTML',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 52,
-		'in_filter': None,
 		'label': 'Terms',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05344',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'tc_name',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 53,
-		'in_filter': None,
 		'label': 'Select Terms',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02778',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'tc_name',
 		'oldfieldtype': 'Link',
 		'options': 'Term',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 54,
-		'in_filter': None,
 		'label': 'Get Terms',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02779',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
 		'options': 'get_tc_details',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Server',
-		'width': None
+		'trigger': 'Server'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
 		'idx': 55,
-		'in_filter': None,
 		'label': 'Terms HTML',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05345',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'HTML',
 		'options': 'You can add Terms and Notes that will be printed in the Transaction',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'terms',
 		'fieldtype': 'Text Editor',
-		'hidden': None,
-		'icon': None,
 		'idx': 56,
-		'in_filter': None,
 		'label': 'Term Details',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02781',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'terms',
 		'oldfieldtype': 'Text Editor',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 57,
-		'in_filter': None,
 		'label': 'More Info',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05346',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 58,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05347',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
 		'default': 'No',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'is_opening',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 59,
 		'in_filter': 1,
 		'label': 'Is Opening',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02785',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'is_opening',
 		'oldfieldtype': 'Select',
 		'options': 'No\nYes',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
 		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'aging_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 60,
-		'in_filter': None,
 		'label': 'Aging Date',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02786',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'aging_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
 		'allow_on_submit': 1,
 		'colour': 'White:FFF',
-		'creation': '2010-12-14 10:23:27',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'letter_head',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 61,
-		'in_filter': None,
 		'label': 'Letter Head',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL04247',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'letter_head',
 		'oldfieldtype': 'Select',
 		'options': 'link:Letter Head',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'source',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 62,
-		'in_filter': None,
 		'label': 'Source',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02790',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'source',
 		'oldfieldtype': 'Select',
 		'options': "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
 		'depends_on': "eval:doc.source == 'Campaign'",
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'campaign',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 63,
-		'in_filter': None,
 		'label': 'Campaign',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02792',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'campaign',
 		'oldfieldtype': 'Link',
 		'options': 'Campaign',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
 		'allow_on_submit': 1,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'select_print_heading',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 64,
-		'in_filter': None,
 		'label': 'Select Print Heading',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02789',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'select_print_heading',
 		'oldfieldtype': 'Link',
 		'options': 'Print Heading',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
 		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:48:01',
-		'default': None,
-		'depends_on': None,
 		'description': 'Track this Sales Invoice against any Project',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'project_name',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 65,
 		'in_filter': 1,
 		'label': 'Project Name',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL03779',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'project_name',
 		'oldfieldtype': 'Link',
 		'options': 'Project',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
 		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 66,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05348',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'company',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 67,
 		'in_filter': 1,
 		'label': 'Company',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02787',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'company',
 		'oldfieldtype': 'Link',
 		'options': 'Company',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'reqd': 1,
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'fiscal_year',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 68,
 		'in_filter': 1,
 		'label': 'Fiscal Year',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02788',
-		'no_column': None,
 		'no_copy': 0,
 		'oldfieldname': 'fiscal_year',
 		'oldfieldtype': 'Select',
 		'options': 'link:Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'reqd': 1,
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'cancel_reason',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 69,
-		'in_filter': None,
 		'label': 'Cancel Reason',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02793',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'cancel_reason',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'remarks',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 70,
-		'in_filter': None,
 		'label': 'Remarks',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02794',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'remarks',
 		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 71,
-		'in_filter': None,
 		'label': 'Totals',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05349',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 72,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05350',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'grand_total',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 73,
 		'in_filter': 1,
 		'label': 'Grand Total',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02798',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'grand_total',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 1,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'rounded_total',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 74,
-		'in_filter': None,
 		'label': 'Rounded Total',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02768',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'rounded_total',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
 		'description': 'In Words will be visible once you save the Sales Invoice.',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'in_words',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 75,
-		'in_filter': None,
 		'label': 'In Words',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02799',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'in_words',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'total_advance',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 76,
-		'in_filter': None,
 		'label': 'Total Advance',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02800',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'total_advance',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'outstanding_amount',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 77,
-		'in_filter': None,
 		'label': 'Outstanding Amount',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02801',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'outstanding_amount',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 78,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05351',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'grand_total_export',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 79,
-		'in_filter': None,
 		'label': 'Grand Total (Export)',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02803',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'grand_total_export',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'rounded_total_export',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 80,
-		'in_filter': None,
 		'label': 'Rounded Total (Export)',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02804',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'rounded_total_export',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
 		'description': 'In Words (Export) will be visible once you save the Sales Invoice.',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'in_words_export',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 81,
-		'in_filter': None,
 		'label': 'In Words (Export)',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02805',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'in_words_export',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'gross_profit',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 82,
-		'in_filter': None,
 		'label': 'Gross Profit',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02806',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'gross_profit',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'gross_profit_percent',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 83,
-		'in_filter': None,
 		'label': 'Gross Profit (%)',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02807',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'gross_profit_percent',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 84,
-		'in_filter': None,
 		'label': 'Advances',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05352',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 85,
-		'in_filter': None,
 		'label': 'Get Advances Received',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02809',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
 		'options': 'get_advances',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'advance_adjustment_details',
 		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
 		'idx': 86,
-		'in_filter': None,
 		'label': 'Advance Adjustment Detail',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02810',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'advance_adjustment_details',
 		'oldfieldtype': 'Table',
 		'options': 'Advance Adjustment Detail',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 87,
-		'in_filter': None,
 		'label': 'Sales Team',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05353',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 88,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05354',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '45%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'sales_partner',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 89,
 		'in_filter': 1,
 		'label': 'Sales Partner',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02813',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'sales_partner',
 		'oldfieldtype': 'Link',
 		'options': 'Sales Partner',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'commission_rate',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 90,
-		'in_filter': None,
 		'label': 'Commission Rate (%)',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02814',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'commission_rate',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'total_commission',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 91,
-		'in_filter': None,
 		'label': 'Total Commission',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02815',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'total_commission',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 92,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL05355',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '55%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'sales_team',
 		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
 		'idx': 93,
-		'in_filter': None,
 		'label': 'Sales Team1',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02817',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'sales_team',
 		'oldfieldtype': 'Table',
 		'options': 'Sales Team',
-		'owner': 'Administrator',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
 		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 94,
-		'in_filter': None,
 		'label': 'Repair Outstanding Amt',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02821',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
 		'options': 'repair_rv_outstanding',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'against_income_account',
 		'fieldtype': 'Small Text',
 		'hidden': 1,
-		'icon': None,
 		'idx': 95,
-		'in_filter': None,
 		'label': 'Against Income Account',
-		'modified': '2011-05-25 12:45:15',
-		'modified_by': 'Guest',
-		'name': 'FL02822',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'against_income_account',
 		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Receivable Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'report_hide': 1
 	}
 ]
\ No newline at end of file
diff --git a/accounts/doctype/rv_detail/rv_detail.txt b/accounts/doctype/rv_detail/rv_detail.txt
index 3ce55463c6..6950ca921a 100644
--- a/accounts/doctype/rv_detail/rv_detail.txt
+++ b/accounts/doctype/rv_detail/rv_detail.txt
@@ -1,1035 +1,458 @@
+# DocType, RV Detail
 [
+
+	# These values are common in all dictionaries
 	{
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'INVD.######',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
 		'creation': '2010-08-08 17:09:20',
-		'description': None,
 		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': 1,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-03-30 11:19:58',
+		'modified': '2011-06-20 13:02:03',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'INVD.######',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
 		'module': 'Accounts',
-		'name': 'RV Detail',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
+		'name': '__common__',
 		'section_style': 'Tray',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 19
+		'version': 22
 	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'RV Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, RV Detail
+	{
+		'doctype': 'DocType',
+		'name': 'RV Detail'
+	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'item_code',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 1,
 		'in_filter': 1,
 		'label': 'Item',
-		'modified': '2011-04-18 13:55:31',
-		'modified_by': 'Administrator',
-		'name': 'FL02850',
-		'no_copy': None,
 		'oldfieldname': 'item_code',
 		'oldfieldtype': 'Link',
 		'options': 'Item',
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
 		'reqd': 0,
 		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'item_name',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
 		'in_filter': 0,
 		'label': 'Item Name',
-		'modified': '2011-04-18 13:55:31',
-		'modified_by': 'Administrator',
-		'name': 'FL02851',
-		'no_copy': None,
 		'oldfieldname': 'item_name',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
+		'search_index': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'description',
 		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
-		'in_filter': None,
 		'label': 'Description',
-		'modified': '2011-04-18 13:55:31',
-		'modified_by': 'Administrator',
-		'name': 'FL02853',
-		'no_copy': None,
 		'oldfieldname': 'description',
 		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': '200px'
+		'width': '300px'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-04 17:22:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'stock_uom',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 4,
-		'in_filter': None,
 		'label': 'UOM',
-		'modified': '2011-04-18 13:55:31',
-		'modified_by': 'Administrator',
-		'name': 'FL04494',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'qty',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 5,
-		'in_filter': None,
 		'label': 'Qty',
-		'modified': '2011-04-18 13:55:31',
-		'modified_by': 'Administrator',
-		'name': 'FL02855',
-		'no_copy': None,
 		'oldfieldname': 'qty',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 0,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'ref_rate',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 6,
-		'in_filter': None,
 		'label': 'Ref Rate',
-		'modified': '2011-04-18 13:55:31',
-		'modified_by': 'Administrator',
-		'name': 'FL02856',
-		'no_copy': None,
 		'oldfieldname': 'ref_rate',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
 		'reqd': 0,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'adj_rate',
 		'fieldtype': 'Float',
-		'hidden': None,
-		'icon': None,
 		'idx': 7,
-		'in_filter': None,
 		'label': 'Discount (%)',
-		'modified': '2011-04-18 13:55:31',
-		'modified_by': 'Administrator',
-		'name': 'FL02857',
-		'no_copy': None,
 		'oldfieldname': 'adj_rate',
 		'oldfieldtype': 'Float',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'export_rate',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 8,
-		'in_filter': None,
 		'label': 'Basic Rate',
-		'modified': '2011-04-18 13:55:31',
-		'modified_by': 'Administrator',
-		'name': 'FL02858',
-		'no_copy': None,
 		'oldfieldname': 'export_rate',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'export_amount',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 9,
-		'in_filter': None,
 		'label': 'Amount',
-		'modified': '2011-04-18 13:55:32',
-		'modified_by': 'Administrator',
-		'name': 'FL02859',
-		'no_copy': None,
 		'oldfieldname': 'export_amount',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'base_ref_rate',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 10,
-		'in_filter': None,
 		'label': 'Ref Rate*',
-		'modified': '2011-04-18 13:55:32',
-		'modified_by': 'Administrator',
-		'name': 'FL02860',
-		'no_copy': None,
 		'oldfieldname': 'base_ref_rate',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'basic_rate',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 11,
 		'in_filter': 0,
 		'label': 'Basic Rate*',
-		'modified': '2011-04-18 13:55:32',
-		'modified_by': 'Administrator',
-		'name': 'FL02861',
-		'no_copy': None,
 		'oldfieldname': 'basic_rate',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
 		'reqd': 1,
 		'search_index': 0,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'amount',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 12,
-		'in_filter': None,
 		'label': 'Amount*',
-		'modified': '2011-04-18 13:55:32',
-		'modified_by': 'Administrator',
-		'name': 'FL02862',
-		'no_copy': None,
 		'oldfieldname': 'amount',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 17:56:49',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'warehouse',
 		'fieldtype': 'Link',
 		'hidden': 0,
-		'icon': None,
 		'idx': 13,
-		'in_filter': None,
 		'label': 'Warehouse',
-		'modified': '2011-04-18 13:55:32',
-		'modified_by': 'Administrator',
-		'name': 'FL04399',
-		'no_copy': None,
 		'oldfieldname': 'warehouse',
 		'oldfieldtype': 'Link',
 		'options': 'Warehouse',
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'income_account',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 14,
 		'in_filter': 1,
 		'label': 'Income Account',
-		'modified': '2011-04-18 13:55:32',
-		'modified_by': 'Administrator',
-		'name': 'FL02863',
-		'no_copy': None,
 		'oldfieldname': 'income_account',
 		'oldfieldtype': 'Link',
 		'options': 'Account',
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': None,
 		'trigger': 'Client',
 		'width': '120px'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'cost_center',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 15,
 		'in_filter': 1,
 		'label': 'Cost Center',
-		'modified': '2011-04-18 13:55:32',
-		'modified_by': 'Administrator',
-		'name': 'FL02864',
-		'no_copy': None,
 		'oldfieldname': 'cost_center',
 		'oldfieldtype': 'Link',
 		'options': 'Cost Center',
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
 		'reqd': 0,
-		'search_index': None,
 		'trigger': 'Client',
 		'width': '120px'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-15 16:42:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'serial_no',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 16,
-		'in_filter': None,
 		'label': 'Serial No',
-		'modified': '2011-04-18 13:55:32',
-		'modified_by': 'Administrator',
-		'name': 'FL04426',
-		'no_copy': None,
 		'oldfieldname': 'serial_no',
 		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-18 13:55:32',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'batch_no',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 17,
-		'in_filter': None,
 		'label': 'Batch No',
-		'modified': '2011-04-18 13:55:32',
-		'modified_by': 'Administrator',
-		'name': '000000137',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'Batch',
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'item_group',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 18,
 		'in_filter': 1,
 		'label': 'Item Group',
-		'modified': '2011-04-18 13:55:32',
-		'modified_by': 'Administrator',
-		'name': 'FL02854',
-		'no_copy': None,
 		'oldfieldname': 'item_group',
 		'oldfieldtype': 'Link',
 		'options': 'Item Group',
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'brand',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 19,
 		'in_filter': 1,
 		'label': 'Brand Name',
-		'modified': '2011-04-18 13:55:32',
-		'modified_by': 'Administrator',
-		'name': 'FL02852',
-		'no_copy': None,
 		'oldfieldname': 'brand',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-23 11:49:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'actual_qty',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 20,
-		'in_filter': None,
 		'label': 'Available Qty at Warehouse',
-		'modified': '2011-04-18 13:55:32',
-		'modified_by': 'Administrator',
-		'name': 'FL04429',
-		'no_copy': None,
 		'oldfieldname': 'actual_qty',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 17:56:49',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'delivered_qty',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 21,
-		'in_filter': None,
 		'label': 'Delivered Qty',
-		'modified': '2011-04-18 13:55:32',
-		'modified_by': 'Administrator',
-		'name': 'FL04400',
-		'no_copy': None,
 		'oldfieldname': 'delivered_qty',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'sales_order',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 22,
 		'in_filter': 1,
 		'label': 'Sales Order',
-		'modified': '2011-04-18 13:55:32',
-		'modified_by': 'Administrator',
-		'name': 'FL02865',
-		'no_copy': None,
 		'oldfieldname': 'sales_order',
 		'oldfieldtype': 'Link',
 		'options': 'Sales Order',
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
 		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'so_detail',
 		'fieldtype': 'Data',
 		'hidden': 1,
-		'icon': None,
 		'idx': 23,
 		'in_filter': 1,
 		'label': 'SO Detail ',
-		'modified': '2011-04-18 13:55:32',
-		'modified_by': 'Administrator',
-		'name': 'FL02866',
-		'no_copy': None,
 		'oldfieldname': 'so_detail',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'delivery_note',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 24,
 		'in_filter': 1,
 		'label': 'Delivery Note',
-		'modified': '2011-04-18 13:55:32',
-		'modified_by': 'Administrator',
-		'name': 'FL02867',
-		'no_copy': None,
 		'oldfieldname': 'delivery_note',
 		'oldfieldtype': 'Link',
 		'options': 'Delivery Note',
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
 		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'dn_detail',
 		'fieldtype': 'Data',
 		'hidden': 1,
-		'icon': None,
 		'idx': 25,
 		'in_filter': 1,
 		'label': 'DN Detail',
-		'modified': '2011-04-18 13:55:32',
-		'modified_by': 'Administrator',
-		'name': 'FL02868',
-		'no_copy': None,
 		'oldfieldname': 'dn_detail',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'item_tax_rate',
 		'fieldtype': 'Small Text',
 		'hidden': 1,
-		'icon': None,
 		'idx': 26,
-		'in_filter': None,
 		'label': 'Item Tax Rate',
-		'modified': '2011-04-18 13:55:32',
-		'modified_by': 'Administrator',
-		'name': 'FL02869',
-		'no_copy': None,
 		'oldfieldname': 'item_tax_rate',
 		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'clear_pending',
 		'fieldtype': 'Check',
 		'hidden': 1,
-		'icon': None,
 		'idx': 27,
-		'in_filter': None,
 		'label': 'Clear Pending',
-		'modified': '2011-04-18 13:55:32',
-		'modified_by': 'Administrator',
-		'name': 'FL02870',
 		'no_copy': 1,
 		'oldfieldname': 'clear_pending',
 		'oldfieldtype': 'Check',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
 		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2011-04-18 13:55:32',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
+		'colour': 'White:FFF',
 		'doctype': 'DocField',
 		'fieldname': 'page_break',
 		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
 		'idx': 28,
-		'in_filter': None,
 		'label': 'Page Break',
-		'modified': '2011-04-18 13:55:32',
-		'modified_by': 'Administrator',
-		'name': '000000138',
 		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'RV Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'report_hide': 1
 	}
 ]
\ No newline at end of file
diff --git a/accounts/doctype/rv_tax_detail/rv_tax_detail.txt b/accounts/doctype/rv_tax_detail/rv_tax_detail.txt
index 0923a44a4a..94846cb3c7 100644
--- a/accounts/doctype/rv_tax_detail/rv_tax_detail.txt
+++ b/accounts/doctype/rv_tax_detail/rv_tax_detail.txt
@@ -1 +1,216 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-03-12 12:09:23', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': 1, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 15, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': 'INVTD.######', 'client_script_core': '', 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'RV Tax Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': '', 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-03-12 12:09:24', 'doctype': 'DocField', 'oldfieldname': 'charge_type', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Type', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'RV Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00502', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-06-08 15:42:49', 'parenttype': 'DocType', 'fieldname': 'charge_type', 'fieldtype': 'Select', 'options': '\nActual\nOn Net Total\nOn Previous Row Amount\nOn Previous Row Total', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:09:24', 'doctype': 'DocField', 'oldfieldname': 'account_head', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Account Head', 'width': '', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'RV Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00504', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-06-08 15:42:49', 'parenttype': 'DocType', 'fieldname': 'account_head', 'fieldtype': 'Link', 'options': 'Account', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-05-17 08:57:15', 'doctype': 'DocField', 'oldfieldname': 'cost_center_other_charges', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Cost Center', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'RV Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05026', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-06-08 15:42:49', 'parenttype': 'DocType', 'fieldname': 'cost_center_other_charges', 'fieldtype': 'Link', 'options': 'Cost Center', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2009-03-12 12:09:24', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Description', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'RV Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00503', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-06-08 15:42:49', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:09:24', 'doctype': 'DocField', 'oldfieldname': 'rate', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Rate', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'RV Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00505', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-06-08 15:42:49', 'parenttype': 'DocType', 'fieldname': 'rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:09:24', 'doctype': 'DocField', 'oldfieldname': 'tax_amount', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Amount*', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'RV Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00506', 'idx': 6, 'default': '', 'colour': None, 'modified': '2010-06-08 15:42:49', 'parenttype': 'DocType', 'fieldname': 'tax_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:09:24', 'doctype': 'DocField', 'oldfieldname': 'total', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Total*', 'width': '', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'RV Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00507', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-06-08 15:42:49', 'parenttype': 'DocType', 'fieldname': 'total', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-27 18:49:14', 'doctype': 'DocField', 'oldfieldname': 'row_id', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Enter Row', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 0, 'description': None, 'parent': 'RV Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01484', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-06-08 15:42:49', 'parenttype': 'DocType', 'fieldname': 'row_id', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2009-04-23 12:35:40', 'doctype': 'DocField', 'oldfieldname': 'item_wise_tax_detail', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Item Wise Tax Detail ', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'RV Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01928', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-06-08 15:42:49', 'parenttype': 'DocType', 'fieldname': 'item_wise_tax_detail', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-05-26 17:28:47', 'doctype': 'DocField', 'oldfieldname': 'parenttype', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Parenttype', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'RV Tax Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02190', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-06-08 15:42:49', 'parenttype': 'DocType', 'fieldname': 'parenttype', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Currency', 'creation': '2010-01-28 11:10:35', 'doctype': 'DocField', 'oldfieldname': 'total_tax_amount', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Total Tax Amount', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': 'Cheating Field\nPlease do not delete ', 'parent': 'RV Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03857', 'idx': 11, 'default': None, 'colour': 'White:FFF', 'modified': '2010-06-08 15:42:49', 'parenttype': 'DocType', 'fieldname': 'total_tax_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Currency', 'creation': '2010-01-28 11:10:35', 'doctype': 'DocField', 'oldfieldname': 'total_amount', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Total Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': 'Cheating Field\nPlease do not delete ', 'parent': 'RV Tax Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03858', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-06-08 15:42:49', 'parenttype': 'DocType', 'fieldname': 'total_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, RV Tax Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:20',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'nabin@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'INVTD.######',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'hide_heading': 1,
+		'istable': 1,
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 15
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'RV Tax Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, RV Tax Detail
+	{
+		'doctype': 'DocType',
+		'name': 'RV Tax Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'charge_type',
+		'fieldtype': 'Select',
+		'idx': 1,
+		'label': 'Type',
+		'oldfieldname': 'charge_type',
+		'oldfieldtype': 'Select',
+		'options': '\nActual\nOn Net Total\nOn Previous Row Amount\nOn Previous Row Total',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'account_head',
+		'fieldtype': 'Link',
+		'idx': 2,
+		'label': 'Account Head',
+		'oldfieldname': 'account_head',
+		'oldfieldtype': 'Link',
+		'options': 'Account',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'cost_center_other_charges',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'label': 'Cost Center',
+		'oldfieldname': 'cost_center_other_charges',
+		'oldfieldtype': 'Link',
+		'options': 'Cost Center',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Small Text',
+		'idx': 4,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'reqd': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rate',
+		'fieldtype': 'Currency',
+		'idx': 5,
+		'label': 'Rate',
+		'oldfieldname': 'rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tax_amount',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'label': 'Amount*',
+		'oldfieldname': 'tax_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'total',
+		'fieldtype': 'Currency',
+		'idx': 7,
+		'label': 'Total*',
+		'oldfieldname': 'total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'row_id',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 8,
+		'label': 'Enter Row',
+		'oldfieldname': 'row_id',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_wise_tax_detail',
+		'fieldtype': 'Small Text',
+		'idx': 9,
+		'label': 'Item Wise Tax Detail ',
+		'oldfieldname': 'item_wise_tax_detail',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'parenttype',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 10,
+		'in_filter': 1,
+		'label': 'Parenttype',
+		'oldfieldname': 'parenttype',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Cheating Field\nPlease do not delete ',
+		'doctype': 'DocField',
+		'fieldname': 'total_tax_amount',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 11,
+		'label': 'Total Tax Amount',
+		'no_copy': 1,
+		'oldfieldname': 'total_tax_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'description': 'Cheating Field\nPlease do not delete ',
+		'doctype': 'DocField',
+		'fieldname': 'total_amount',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 12,
+		'label': 'Total Amount',
+		'no_copy': 1,
+		'oldfieldname': 'total_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/supplier_tds_category_detail/supplier_tds_category_detail.txt b/accounts/doctype/supplier_tds_category_detail/supplier_tds_category_detail.txt
deleted file mode 100644
index 928ddd745c..0000000000
--- a/accounts/doctype/supplier_tds_category_detail/supplier_tds_category_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-06-15 16:18:15', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 2, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Supplier TDS Category Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-06-15 16:18:15', 'doctype': 'DocField', 'oldfieldname': 'tds_category', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'TDS Category', 'width': '300px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier TDS Category Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02337', 'idx': 1, 'default': None, 'colour': None, 'modified': '2009-06-15 17:01:44', 'parenttype': 'DocType', 'fieldname': 'tds_category', 'fieldtype': 'Select', 'options': 'link:TDS Category', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/accounts/doctype/tds_category/tds_category.txt b/accounts/doctype/tds_category/tds_category.txt
index 177e3c44de..509f177145 100644
--- a/accounts/doctype/tds_category/tds_category.txt
+++ b/accounts/doctype/tds_category/tds_category.txt
@@ -1,266 +1,141 @@
+# DocType, TDS Category
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': '1300960461',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'field:category_name',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-11-30 17:30:43',
-		'description': None,
+		'creation': '2010-08-08 17:09:27',
 		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': 0,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'last_update': '1294160993',
-		'max_attachments': None,
-		'menu_index': None,
 		'modified': '2010-09-20 14:06:57',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1302586171',
+		'autoname': 'field:category_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'in_create': 0,
 		'module': 'Accounts',
-		'name': 'TDS Category',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
+		'name': '__common__',
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 9
+		'version': 8
 	},
+
+	# These values are common for all DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:43',
-		'default': 'Accounts',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'module',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 1,
-		'in_filter': 0,
-		'label': 'Module',
-		'modified': '2011-03-24 15:58:08',
-		'modified_by': 'Administrator',
-		'name': 'FL00996',
-		'no_copy': None,
-		'oldfieldname': 'module',
-		'oldfieldtype': 'Link',
-		'options': 'Module Def',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'parent': 'TDS Category',
 		'parentfield': 'fields',
 		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': 0,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# These values are common for all DocPerm
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-24 15:58:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Note HTML',
-		'modified': '2011-03-24 15:58:08',
-		'modified_by': 'Administrator',
-		'name': '000006316',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': 'Note: You must first create the Accounts from the Chart of Accounts and then link it to this Category.',
-		'owner': 'Administrator',
+		'doctype': 'DocPerm',
+		'name': '__common__',
 		'parent': 'TDS Category',
-		'parentfield': 'fields',
+		'parentfield': 'permissions',
 		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'read': 1
 	},
+
+	# DocType, TDS Category
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:43',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'category_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Category Name',
-		'modified': '2011-03-24 15:58:08',
-		'modified_by': 'Administrator',
-		'name': 'FL00998',
-		'no_copy': None,
-		'oldfieldname': 'category_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'TDS Category',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:43',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'tds_sh_edu_cess_account',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'TDS Account Detail',
-		'modified': '2011-03-24 15:58:08',
-		'modified_by': 'Administrator',
-		'name': 'FL00999',
-		'no_copy': None,
-		'oldfieldname': 'tds_sh_edu_cess_account',
-		'oldfieldtype': 'Table',
-		'options': 'TDS Category Account',
-		'owner': 'Administrator',
-		'parent': 'TDS Category',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'doctype': 'DocType',
+		'name': 'TDS Category'
 	},
+
+	# DocPerm
 	{
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'creation': '2010-11-30 17:30:43',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 1,
-		'match': None,
-		'modified': '2010-11-30 17:30:43',
-		'modified_by': 'Administrator',
-		'name': 'PERM00112',
-		'owner': 'Administrator',
-		'parent': 'TDS Category',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
 		'role': 'Accounts User',
 		'submit': 0,
 		'write': 0
 	},
+
+	# DocPerm
 	{
 		'amend': 0,
 		'cancel': 0,
 		'create': 1,
-		'creation': '2010-11-30 17:30:43',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 2,
-		'match': None,
-		'modified': '2010-11-30 17:30:43',
-		'modified_by': 'Administrator',
-		'name': 'PERM00113',
-		'owner': 'Administrator',
-		'parent': 'TDS Category',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
 		'role': 'Accounts Manager',
 		'submit': 0,
 		'write': 1
 	},
+
+	# DocPerm
 	{
-		'amend': None,
-		'cancel': None,
 		'create': 1,
-		'creation': '2010-11-30 17:30:43',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 3,
-		'match': None,
-		'modified': '2010-11-30 17:30:43',
-		'modified_by': 'Administrator',
-		'name': 'PERM00114',
-		'owner': 'Administrator',
-		'parent': 'TDS Category',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
+		'role': 'System Manager',
 		'write': 1
+	},
+
+	# DocField
+	{
+		'default': 'Accounts',
+		'doctype': 'DocField',
+		'fieldname': 'module',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 1,
+		'in_filter': 0,
+		'label': 'Module',
+		'oldfieldname': 'module',
+		'oldfieldtype': 'Link',
+		'options': 'Module Def',
+		'print_hide': 0,
+		'report_hide': 0,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 2,
+		'label': 'Note HTML',
+		'oldfieldtype': 'HTML',
+		'options': 'Note: You must first create the Accounts from the Chart of Accounts and then link it to this Category.'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'category_name',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Category Name',
+		'oldfieldname': 'category_name',
+		'oldfieldtype': 'Data',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tds_sh_edu_cess_account',
+		'fieldtype': 'Table',
+		'idx': 4,
+		'label': 'TDS Account Detail',
+		'oldfieldname': 'tds_sh_edu_cess_account',
+		'oldfieldtype': 'Table',
+		'options': 'TDS Category Account',
+		'reqd': 0
 	}
 ]
\ No newline at end of file
diff --git a/accounts/doctype/tds_category_account/tds_category_account.txt b/accounts/doctype/tds_category_account/tds_category_account.txt
index 02a0f38f70..88ee39a70d 100644
--- a/accounts/doctype/tds_category_account/tds_category_account.txt
+++ b/accounts/doctype/tds_category_account/tds_category_account.txt
@@ -1 +1,66 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-05-06 14:05:43', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 1, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'wasim@webnotestech.com', 'document_type': None, 'name': 'TDS Category Account', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-05-06 14:05:43', 'doctype': 'DocField', 'oldfieldname': 'company', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'wasim@webnotestech.com', 'label': 'Company', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Category Account', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01996', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-03-10 11:17:57', 'parenttype': 'DocType', 'fieldname': 'company', 'fieldtype': 'Link', 'options': 'Company', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-05-06 14:05:43', 'doctype': 'DocField', 'oldfieldname': 'account_head', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'wasim@webnotestech.com', 'label': 'Account Head', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Category Account', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01997', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-03-10 11:17:57', 'parenttype': 'DocType', 'fieldname': 'account_head', 'fieldtype': 'Link', 'options': 'Account', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, TDS Category Account
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:27',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 1
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Link',
+		'name': '__common__',
+		'oldfieldtype': 'Link',
+		'parent': 'TDS Category Account',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocType, TDS Category Account
+	{
+		'doctype': 'DocType',
+		'name': 'TDS Category Account'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'options': 'Company',
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'account_head',
+		'idx': 3,
+		'label': 'Account Head',
+		'oldfieldname': 'account_head',
+		'options': 'Account'
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/tds_control/tds_control.txt b/accounts/doctype/tds_control/tds_control.txt
index ff2e9e435f..03f17b56b2 100644
--- a/accounts/doctype/tds_control/tds_control.txt
+++ b/accounts/doctype/tds_control/tds_control.txt
@@ -1 +1,31 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-03-05 12:23:01', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'wasim@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 38, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': '', 'name': 'TDS Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-12-07 12:30:02', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
+# DocType, TDS Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:27',
+		'docstatus': 0,
+		'modified': '2010-12-16 16:31:49',
+		'modified_by': 'Administrator',
+		'owner': 'wasim@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 36
+	},
+
+	# DocType, TDS Control
+	{
+		'doctype': 'DocType',
+		'name': 'TDS Control'
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/tds_detail/tds_detail.txt b/accounts/doctype/tds_detail/tds_detail.txt
index bae5014a9e..f24e32a4b2 100644
--- a/accounts/doctype/tds_detail/tds_detail.txt
+++ b/accounts/doctype/tds_detail/tds_detail.txt
@@ -1 +1,133 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-02-22 15:27:11', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'wasim@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 2, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'wasim@webnotestech.com', 'document_type': None, 'name': 'TDS Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'wasim@webnotestech.com', 'name': 'PERM00682', 'parent': 'TDS Detail', 'read': 1, 'create': 0, 'creation': '2010-02-22 15:27:11', 'modified': '2010-02-22 15:30:13', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'All', 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'wasim@webnotestech.com', 'name': 'PERM00683', 'parent': 'TDS Detail', 'read': 1, 'create': None, 'creation': '2010-02-22 15:27:11', 'modified': '2010-02-22 15:30:13', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'All', 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'wasim@webnotestech.com', 'name': 'PERM00684', 'parent': 'TDS Detail', 'read': 1, 'create': None, 'creation': '2010-02-22 15:27:11', 'modified': '2010-02-22 15:30:13', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'wasim@webnotestech.com', 'name': 'PERM00685', 'parent': 'TDS Detail', 'read': 1, 'create': None, 'creation': '2010-02-22 15:27:11', 'modified': '2010-02-22 15:30:13', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 4, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-02-22 15:27:11', 'doctype': 'DocField', 'oldfieldname': 'tds_category', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'wasim@webnotestech.com', 'label': 'TDS Category', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04030', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-02-22 15:30:13', 'parenttype': 'DocType', 'fieldname': 'tds_category', 'fieldtype': 'Select', 'options': 'link:TDS Category', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-02-22 15:27:11', 'doctype': 'DocField', 'oldfieldname': 'special_tds_rate_applicable', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'wasim@webnotestech.com', 'label': 'Special TDS Rate Applicable', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04031', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-02-22 15:30:13', 'parenttype': 'DocType', 'fieldname': 'special_tds_rate_applicable', 'fieldtype': 'Select', 'options': '\nYes\nNo', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-02-22 15:27:11', 'doctype': 'DocField', 'oldfieldname': 'special_tds_rate', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'wasim@webnotestech.com', 'label': 'Special TDS Rate(Section-197)\t', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04032', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-02-22 15:30:13', 'parenttype': 'DocType', 'fieldname': 'special_tds_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-02-22 15:27:11', 'doctype': 'DocField', 'oldfieldname': 'special_tds_limit', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'wasim@webnotestech.com', 'label': 'Special TDS Limit', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04033', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-02-22 15:30:13', 'parenttype': 'DocType', 'fieldname': 'special_tds_limit', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, TDS Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:27',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'wasim@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 2
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'TDS Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'width': '150px'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'TDS Detail',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, TDS Detail
+	{
+		'doctype': 'DocType',
+		'name': 'TDS Detail'
+	},
+
+	# DocPerm
+	{
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'All',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'All'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tds_category',
+		'fieldtype': 'Select',
+		'idx': 1,
+		'label': 'TDS Category',
+		'oldfieldname': 'tds_category',
+		'oldfieldtype': 'Select',
+		'options': 'link:TDS Category'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'special_tds_rate_applicable',
+		'fieldtype': 'Select',
+		'idx': 2,
+		'label': 'Special TDS Rate Applicable',
+		'oldfieldname': 'special_tds_rate_applicable',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'special_tds_rate',
+		'fieldtype': 'Currency',
+		'idx': 3,
+		'label': 'Special TDS Rate(Section-197)\t',
+		'oldfieldname': 'special_tds_rate',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'special_tds_limit',
+		'fieldtype': 'Currency',
+		'idx': 4,
+		'label': 'Special TDS Limit',
+		'oldfieldname': 'special_tds_limit',
+		'oldfieldtype': 'Currency'
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/tds_payment/tds_payment.txt b/accounts/doctype/tds_payment/tds_payment.txt
index 0d1e7822ac..abd4b0cdc0 100644
--- a/accounts/doctype/tds_payment/tds_payment.txt
+++ b/accounts/doctype/tds_payment/tds_payment.txt
@@ -1,1362 +1,451 @@
+# DocType, TDS Payment
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': '1300960463',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-11-30 17:30:43',
-		'description': None,
+		'creation': '2010-08-08 17:09:27',
 		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': 0,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'last_update': '1294160989',
-		'max_attachments': None,
-		'menu_index': None,
 		'modified': '2010-11-03 11:48:59',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 0,
 		'module': 'Accounts',
-		'name': 'TDS Payment',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
+		'name': '__common__',
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 225
+		'version': 223
 	},
+
+	# These values are common for all DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-24 15:58:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-03-24 15:58:09',
-		'modified_by': 'Administrator',
-		'name': '000006325',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
+		'name': '__common__',
 		'parent': 'TDS Payment',
 		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
+		'parenttype': 'DocType'
 	},
+
+	# These values are common for all DocPerm
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'from_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': 1,
-		'label': 'From Date',
-		'modified': '2011-03-24 15:58:08',
-		'modified_by': 'Administrator',
-		'name': 'FL01007',
-		'no_copy': None,
-		'oldfieldname': 'from_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
+		'doctype': 'DocPerm',
+		'name': '__common__',
 		'parent': 'TDS Payment',
-		'parentfield': 'fields',
+		'parentfield': 'permissions',
 		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
+		'read': 1
 	},
+
+	# DocType, TDS Payment
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'to_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 1,
-		'label': 'To Date',
-		'modified': '2011-03-24 15:58:08',
-		'modified_by': 'Administrator',
-		'name': 'FL01008',
-		'no_copy': None,
-		'oldfieldname': 'to_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-11-30 17:30:36',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'tds_category',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'TDS Category',
-		'modified': '2011-03-24 15:58:08',
-		'modified_by': 'Administrator',
-		'name': 'FL00706',
-		'no_copy': None,
-		'oldfieldname': 'tds_category',
-		'oldfieldtype': 'Link',
-		'options': 'TDS Category',
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-11-30 17:30:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'tds_category',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'TDS Category',
-		'modified': '2010-11-30 17:30:44',
-		'modified_by': 'Administrator',
-		'name': 'FL01009',
-		'no_copy': None,
-		'oldfieldname': 'tds_category',
-		'oldfieldtype': 'Link',
-		'options': 'TDS Category',
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': ''
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-24 15:58:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-03-24 15:58:09',
-		'modified_by': 'Administrator',
-		'name': '000006326',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:44',
-		'default': 'TDSP/10-11/',
-		'depends_on': None,
-		'description': 'To manage multiple series please go to Setup > Series Setup',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'naming_series',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Naming Series',
-		'modified': '2010-11-30 17:30:44',
-		'modified_by': 'Administrator',
-		'name': 'FL01011',
-		'no_copy': None,
-		'oldfieldname': 'naming_series',
-		'oldfieldtype': 'Select',
-		'options': 'TDSP/10-11/\nTDSP/\nTDSP/11-12/\nTDSP',
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-23 11:02:17',
-		'default': 'TDSP/10-11/',
-		'depends_on': None,
-		'description': 'To manage multiple series please go to Setup > Series Setup',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'naming_series',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Naming Series',
-		'modified': '2011-03-24 15:58:08',
-		'modified_by': 'Administrator',
-		'name': '000002588',
-		'no_copy': None,
-		'oldfieldname': 'naming_series',
-		'oldfieldtype': 'Select',
-		'options': 'TDSP/10-11/\nTDSP/\nTDSP/11-12/\nTDSP',
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2010-11-30 17:30:44',
-		'modified_by': 'Administrator',
-		'name': 'FL01012',
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-23 10:53:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-03-24 15:58:08',
-		'modified_by': 'Administrator',
-		'name': '000000305',
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Amended From',
-		'modified': '2011-03-24 15:58:08',
-		'modified_by': 'Administrator',
-		'name': 'FL01013',
-		'no_copy': None,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:44',
-		'default': None,
-		'depends_on': None,
-		'description': 'The date at which current entry is corrected in the system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Amendment Date',
-		'modified': '2011-03-24 15:58:08',
-		'modified_by': 'Administrator',
-		'name': 'FL01014',
-		'no_copy': None,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-24 15:58:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-03-24 15:58:09',
-		'modified_by': 'Administrator',
-		'name': '000006327',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-24 15:58:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-03-24 15:58:09',
-		'modified_by': 'Administrator',
-		'name': '000006328',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-11-30 17:30:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-03-24 15:58:08',
-		'modified_by': 'Administrator',
-		'name': 'FL01017',
-		'no_copy': None,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:36',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'registration_details',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Registration Details',
-		'modified': '2011-03-24 15:58:08',
-		'modified_by': 'Administrator',
-		'name': 'FL00714',
-		'no_copy': None,
-		'oldfieldname': 'registration_details',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'registration_details',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Registration Details',
-		'modified': '2010-11-30 17:30:44',
-		'modified_by': 'Administrator',
-		'name': 'FL01018',
-		'no_copy': None,
-		'oldfieldname': 'registration_details',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:25:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'remarks',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Remark',
-		'modified': '2011-03-24 15:58:08',
-		'modified_by': 'Administrator',
-		'name': 'FL00474',
-		'no_copy': 1,
-		'oldfieldname': 'remarks',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'remarks',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Remark',
-		'modified': '2010-11-30 17:30:44',
-		'modified_by': 'Administrator',
-		'name': 'FL01019',
-		'no_copy': 1,
-		'oldfieldname': 'remarks',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-24 15:58:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-03-24 15:58:09',
-		'modified_by': 'Administrator',
-		'name': '000006329',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-24 15:58:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-03-24 15:58:09',
-		'modified_by': 'Administrator',
-		'name': '000006330',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': 'Please Update Cheque No., BSR Code, Challan ID no. after actual payment. Unless you do not get it in Form 16A.',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-11-30 17:30:36',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'cheque_no',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Cheque / DD No.',
-		'modified': '2011-03-24 15:58:08',
-		'modified_by': 'Administrator',
-		'name': 'FL00737',
-		'no_copy': None,
-		'oldfieldname': 'cheque_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-11-30 17:30:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'cheque_no',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Cheque / DD No.',
-		'modified': '2010-11-30 17:30:44',
-		'modified_by': 'Administrator',
-		'name': 'FL01022',
-		'no_copy': None,
-		'oldfieldname': 'cheque_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-11-30 17:30:36',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'bsr_code',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'BSR Code',
-		'modified': '2011-03-24 15:58:08',
-		'modified_by': 'Administrator',
-		'name': 'FL00738',
-		'no_copy': None,
-		'oldfieldname': 'bsr_code',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-11-30 17:30:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'bsr_code',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'BSR Code',
-		'modified': '2010-11-30 17:30:44',
-		'modified_by': 'Administrator',
-		'name': 'FL01023',
-		'no_copy': None,
-		'oldfieldname': 'bsr_code',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-11-30 17:30:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'date_of_receipt',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Date of Receipt',
-		'modified': '2011-03-24 15:58:08',
-		'modified_by': 'Administrator',
-		'name': 'FL01024',
-		'no_copy': None,
-		'oldfieldname': 'date_of_receipt',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-11-30 17:30:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'challan_id',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'Challan ID',
-		'modified': '2011-03-24 15:58:08',
-		'modified_by': 'Administrator',
-		'name': 'FL01025',
-		'no_copy': None,
-		'oldfieldname': 'challan_id',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-11-30 17:30:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
-		'label': 'Update',
-		'modified': '2011-03-24 15:58:08',
-		'modified_by': 'Administrator',
-		'name': 'FL01026',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'update_ack_details',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': 0,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-24 15:58:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-03-24 15:58:09',
-		'modified_by': 'Administrator',
-		'name': '000006331',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': None,
-		'label': 'Get TDS List',
-		'modified': '2011-03-24 15:58:08',
-		'modified_by': 'Administrator',
-		'name': 'FL01028',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'get_tds_list',
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'tds_payment_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 24,
-		'in_filter': None,
-		'label': 'TDS Payment Details',
-		'modified': '2011-03-24 15:58:09',
-		'modified_by': 'Administrator',
-		'name': 'FL01029',
-		'no_copy': None,
-		'oldfieldname': 'tds_payment_details',
-		'oldfieldtype': 'Table',
-		'options': 'TDS Payment Detail',
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-24 15:58:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 25,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-03-24 15:58:09',
-		'modified_by': 'Administrator',
-		'name': '000006332',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'total_tds',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 26,
-		'in_filter': None,
-		'label': 'Total TDS',
-		'modified': '2011-03-24 15:58:09',
-		'modified_by': 'Administrator',
-		'name': 'FL01031',
-		'no_copy': None,
-		'oldfieldname': 'total_tds',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-11-30 17:30:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 27,
-		'in_filter': None,
-		'label': 'Make Bank Voucher',
-		'modified': '2011-03-24 15:58:09',
-		'modified_by': 'Administrator',
-		'name': 'FL01032',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'doctype': 'DocType',
+		'name': 'TDS Payment'
 	},
+
+	# DocPerm
 	{
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'creation': '2010-11-30 17:30:44',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 1,
-		'match': None,
-		'modified': '2010-11-30 17:30:44',
-		'modified_by': 'Administrator',
-		'name': 'PERM00119',
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'read': 1,
 		'role': 'Accounts User',
 		'submit': 0,
 		'write': 0
 	},
+
+	# DocPerm
 	{
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2010-11-30 17:30:44',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 2,
-		'match': None,
-		'modified': '2010-11-30 17:30:44',
-		'modified_by': 'Administrator',
-		'name': 'PERM00120',
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'read': 1,
-		'role': 'Administrator',
+		'role': 'System Manager',
 		'submit': 1,
 		'write': 1
 	},
+
+	# DocPerm
 	{
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2010-11-30 17:30:44',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 3,
-		'match': None,
-		'modified': '2010-11-30 17:30:44',
-		'modified_by': 'Administrator',
-		'name': 'PERM00121',
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'read': 1,
 		'role': 'Accounts User',
 		'submit': 1,
 		'write': 1
 	},
+
+	# DocPerm
 	{
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2010-11-30 17:30:44',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 4,
-		'match': None,
-		'modified': '2010-11-30 17:30:44',
-		'modified_by': 'Administrator',
-		'name': 'PERM00122',
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'read': 1,
 		'role': 'Accounts Manager',
 		'submit': 1,
 		'write': 1
 	},
+
+	# DocPerm
 	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-11-30 17:30:44',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 5,
-		'match': None,
-		'modified': '2010-11-30 17:30:44',
-		'modified_by': 'Administrator',
-		'name': 'PERM00123',
-		'owner': 'Administrator',
-		'parent': 'TDS Payment',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'read': 1,
-		'role': 'All',
-		'submit': None,
-		'write': None
+		'role': 'All'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 1,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'from_date',
+		'fieldtype': 'Date',
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'From Date',
+		'oldfieldname': 'from_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'to_date',
+		'fieldtype': 'Date',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'To Date',
+		'oldfieldname': 'to_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'tds_category',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'TDS Category',
+		'oldfieldname': 'tds_category',
+		'oldfieldtype': 'Link',
+		'options': 'TDS Category',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 5,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'description': 'To manage multiple series please go to Setup > Series Setup',
+		'doctype': 'DocField',
+		'fieldname': 'naming_series',
+		'fieldtype': 'Select',
+		'idx': 6,
+		'label': 'Naming Series',
+		'no_copy': 1,
+		'oldfieldname': 'naming_series',
+		'oldfieldtype': 'Select',
+		'options': 'TDSP',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 7,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'idx': 8,
+		'label': 'Amended From',
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'description': 'The date at which current entry is corrected in the system.',
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'idx': 9,
+		'label': 'Amendment Date',
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 10,
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 11,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 12,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'registration_details',
+		'fieldtype': 'Small Text',
+		'idx': 13,
+		'label': 'Registration Details',
+		'oldfieldname': 'registration_details',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'remarks',
+		'fieldtype': 'Small Text',
+		'idx': 14,
+		'label': 'Remark',
+		'no_copy': 1,
+		'oldfieldname': 'remarks',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 15,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 16,
+		'oldfieldtype': 'HTML',
+		'options': 'Please Update Cheque No., BSR Code, Challan ID no. after actual payment. Unless you do not get it in Form 16A.',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'cheque_no',
+		'fieldtype': 'Data',
+		'idx': 17,
+		'label': 'Cheque / DD No.',
+		'oldfieldname': 'cheque_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'bsr_code',
+		'fieldtype': 'Data',
+		'idx': 18,
+		'label': 'BSR Code',
+		'oldfieldname': 'bsr_code',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'date_of_receipt',
+		'fieldtype': 'Date',
+		'idx': 19,
+		'label': 'Date of Receipt',
+		'oldfieldname': 'date_of_receipt',
+		'oldfieldtype': 'Date',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'challan_id',
+		'fieldtype': 'Data',
+		'idx': 20,
+		'label': 'Challan ID',
+		'oldfieldname': 'challan_id',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 21,
+		'label': 'Update',
+		'oldfieldtype': 'Button',
+		'options': 'update_ack_details',
+		'permlevel': 0,
+		'report_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 22,
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 23,
+		'label': 'Get TDS List',
+		'oldfieldtype': 'Button',
+		'options': 'get_tds_list',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tds_payment_details',
+		'fieldtype': 'Table',
+		'idx': 24,
+		'label': 'TDS Payment Details',
+		'oldfieldname': 'tds_payment_details',
+		'oldfieldtype': 'Table',
+		'options': 'TDS Payment Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 25,
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'total_tds',
+		'fieldtype': 'Currency',
+		'idx': 26,
+		'label': 'Total TDS',
+		'oldfieldname': 'total_tds',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 27,
+		'label': 'Make Bank Voucher',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/doctype/tds_payment_detail/tds_payment_detail.txt b/accounts/doctype/tds_payment_detail/tds_payment_detail.txt
index f973a8ad45..d971509fb0 100644
--- a/accounts/doctype/tds_payment_detail/tds_payment_detail.txt
+++ b/accounts/doctype/tds_payment_detail/tds_payment_detail.txt
@@ -1 +1,118 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-05-25 16:52:54', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 12, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'nabin@webnotestech.com', 'document_type': None, 'name': 'TDS Payment Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-05-25 16:52:54', 'doctype': 'DocField', 'oldfieldname': 'voucher_no', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Voucher No', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Payment Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02155', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-01 14:18:34', 'parenttype': 'DocType', 'fieldname': 'voucher_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-05-25 16:52:54', 'doctype': 'DocField', 'oldfieldname': 'party_name', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Party Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Payment Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02154', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-01 14:18:34', 'parenttype': 'DocType', 'fieldname': 'party_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-05-25 16:52:54', 'doctype': 'DocField', 'oldfieldname': 'amount_paid', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Amount paid / credited', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Payment Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02156', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-01 14:18:34', 'parenttype': 'DocType', 'fieldname': 'amount_paid', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2009-05-25 16:52:54', 'doctype': 'DocField', 'oldfieldname': 'date_of_payment', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Date of payment / credit', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Payment Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02157', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-09-01 14:18:34', 'parenttype': 'DocType', 'fieldname': 'date_of_payment', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-05-25 16:52:54', 'doctype': 'DocField', 'oldfieldname': 'tds_amount', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'TDS', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Payment Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02158', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-09-01 14:18:34', 'parenttype': 'DocType', 'fieldname': 'tds_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-06-11 15:45:56', 'doctype': 'DocField', 'oldfieldname': 'cess_on_tds', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Cess on TDS', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Payment Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05338', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-09-01 14:18:34', 'parenttype': 'DocType', 'fieldname': 'cess_on_tds', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-05-25 16:52:54', 'doctype': 'DocField', 'oldfieldname': 'total_tax_amount', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Total Tax Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Payment Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02162', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-09-01 14:18:34', 'parenttype': 'DocType', 'fieldname': 'total_tax_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, TDS Payment Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:27',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 11
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'TDS Payment Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, TDS Payment Detail
+	{
+		'doctype': 'DocType',
+		'name': 'TDS Payment Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'voucher_no',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Voucher No',
+		'oldfieldname': 'voucher_no',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'party_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Party Name',
+		'oldfieldname': 'party_name',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amount_paid',
+		'fieldtype': 'Currency',
+		'idx': 3,
+		'label': 'Amount paid / credited',
+		'oldfieldname': 'amount_paid',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'date_of_payment',
+		'fieldtype': 'Date',
+		'idx': 4,
+		'label': 'Date of payment / credit',
+		'oldfieldname': 'date_of_payment',
+		'oldfieldtype': 'Date'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tds_amount',
+		'fieldtype': 'Currency',
+		'idx': 5,
+		'label': 'TDS',
+		'oldfieldname': 'tds_amount',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'cess_on_tds',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'label': 'Cess on TDS',
+		'oldfieldname': 'cess_on_tds',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'total_tax_amount',
+		'fieldtype': 'Currency',
+		'idx': 7,
+		'label': 'Total Tax Amount',
+		'oldfieldname': 'total_tax_amount',
+		'oldfieldtype': 'Currency'
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/tds_rate_chart/tds_rate_chart.txt b/accounts/doctype/tds_rate_chart/tds_rate_chart.txt
index 9124207968..23e7b72047 100644
--- a/accounts/doctype/tds_rate_chart/tds_rate_chart.txt
+++ b/accounts/doctype/tds_rate_chart/tds_rate_chart.txt
@@ -1,266 +1,127 @@
+# DocType, TDS Rate Chart
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': '1300960463',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'Prompt',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-11-30 17:30:44',
-		'description': None,
+		'creation': '2010-08-08 17:09:27',
 		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': 1,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'last_update': '1294160988',
-		'max_attachments': None,
-		'menu_index': None,
 		'modified': '2010-09-20 14:06:57',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'Prompt',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 1,
 		'module': 'Accounts',
-		'name': 'TDS Rate Chart',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
+		'name': '__common__',
 		'read_only': 0,
-		'read_only_onload': None,
-		'search_fields': None,
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 12
+		'version': 11
 	},
+
+	# These values are common for all DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2009-05-12 11:19:12',
-		'default': 'Accounts',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'module',
-		'fieldtype': 'Link',
-		'hidden': 1,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Module',
-		'modified': '2011-03-24 15:58:09',
-		'modified_by': 'Administrator',
-		'name': 'FL00067',
-		'no_copy': None,
-		'oldfieldname': 'module',
-		'oldfieldtype': 'Link',
-		'options': 'Module Def',
-		'owner': 'saumil@webnotestech.com',
+		'name': '__common__',
 		'parent': 'TDS Rate Chart',
 		'parentfield': 'fields',
 		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# These values are common for all DocPerm
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:45',
-		'default': 'Accounts',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'module',
-		'fieldtype': 'Link',
-		'hidden': 1,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Module',
-		'modified': '2010-11-30 17:30:45',
-		'modified_by': 'Administrator',
-		'name': 'FL01040',
-		'no_copy': None,
-		'oldfieldname': 'module',
-		'oldfieldtype': 'Link',
-		'options': 'Module Def',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'TDS Rate Chart',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:45',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'applicable_from',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Applicable From',
-		'modified': '2011-03-24 15:58:09',
-		'modified_by': 'Administrator',
-		'name': 'FL01041',
-		'no_copy': None,
-		'oldfieldname': 'applicable_from',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'TDS Rate Chart',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:45',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'rate_chart_detail',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Rate Chart Detail',
-		'modified': '2011-03-24 15:58:09',
-		'modified_by': 'Administrator',
-		'name': 'FL01042',
-		'no_copy': None,
-		'oldfieldname': 'rate_chart_detail',
-		'oldfieldtype': 'Table',
-		'options': 'TDS Rate Detail',
-		'owner': 'Administrator',
-		'parent': 'TDS Rate Chart',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-11-30 17:30:45',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2010-11-30 17:30:45',
-		'modified_by': 'Administrator',
-		'name': 'PERM00124',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'parent': 'TDS Rate Chart',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
 		'permlevel': 0,
-		'read': 1,
+		'read': 1
+	},
+
+	# DocType, TDS Rate Chart
+	{
+		'doctype': 'DocType',
+		'name': 'TDS Rate Chart'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
 		'role': 'Accounts User',
 		'submit': 0,
 		'write': 0
 	},
+
+	# DocPerm
 	{
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'creation': '2010-11-30 17:30:45',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 2,
-		'match': None,
-		'modified': '2010-11-30 17:30:45',
-		'modified_by': 'Administrator',
-		'name': 'PERM00125',
-		'owner': 'Administrator',
-		'parent': 'TDS Rate Chart',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
 		'role': 'Accounts Manager',
 		'submit': 0,
 		'write': 0
 	},
+
+	# DocPerm
 	{
-		'amend': None,
-		'cancel': None,
 		'create': 1,
-		'creation': '2010-11-30 17:30:45',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 3,
-		'match': None,
-		'modified': '2010-11-30 17:30:45',
-		'modified_by': 'Administrator',
-		'name': 'PERM00126',
-		'owner': 'Administrator',
-		'parent': 'TDS Rate Chart',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
+		'role': 'System Manager',
 		'write': 1
+	},
+
+	# DocField
+	{
+		'default': 'Accounts',
+		'doctype': 'DocField',
+		'fieldname': 'module',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 1,
+		'label': 'Module',
+		'oldfieldname': 'module',
+		'oldfieldtype': 'Link',
+		'options': 'Module Def',
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'applicable_from',
+		'fieldtype': 'Date',
+		'idx': 2,
+		'label': 'Applicable From',
+		'oldfieldname': 'applicable_from',
+		'oldfieldtype': 'Date',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rate_chart_detail',
+		'fieldtype': 'Table',
+		'idx': 3,
+		'label': 'Rate Chart Detail',
+		'oldfieldname': 'rate_chart_detail',
+		'oldfieldtype': 'Table',
+		'options': 'TDS Rate Detail'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/doctype/tds_rate_detail/tds_rate_detail.txt b/accounts/doctype/tds_rate_detail/tds_rate_detail.txt
index 0a1cb24578..b7e19b1e63 100644
--- a/accounts/doctype/tds_rate_detail/tds_rate_detail.txt
+++ b/accounts/doctype/tds_rate_detail/tds_rate_detail.txt
@@ -1 +1,88 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-05-06 12:24:07', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 7, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'nabin@webnotestech.com', 'document_type': None, 'name': 'TDS Rate Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-05-06 12:24:07', 'doctype': 'DocField', 'oldfieldname': 'category', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Category', 'width': '200px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Rate Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01976', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-06-30 15:37:49', 'parenttype': 'DocType', 'fieldname': 'category', 'fieldtype': 'Link', 'options': 'TDS Category', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-05-06 12:24:07', 'doctype': 'DocField', 'oldfieldname': 'slab_from', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Slab From', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Rate Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01977', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-06-30 15:37:49', 'parenttype': 'DocType', 'fieldname': 'slab_from', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-05-06 12:24:07', 'doctype': 'DocField', 'oldfieldname': 'rate', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Rate', 'width': '50px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Rate Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01978', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-06-30 15:37:49', 'parenttype': 'DocType', 'fieldname': 'rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-06-30 15:37:49', 'doctype': 'DocField', 'oldfieldname': 'rate_without_pan', 'owner': 'nabin@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Rate without PAN', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Rate Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05508', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-06-30 15:37:49', 'parenttype': 'DocType', 'fieldname': 'rate_without_pan', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, TDS Rate Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:27',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 7
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'TDS Rate Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, TDS Rate Detail
+	{
+		'doctype': 'DocType',
+		'name': 'TDS Rate Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'category',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Category',
+		'oldfieldname': 'category',
+		'oldfieldtype': 'Link',
+		'options': 'TDS Category',
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'slab_from',
+		'fieldtype': 'Currency',
+		'idx': 2,
+		'label': 'Slab From',
+		'oldfieldname': 'slab_from',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rate',
+		'fieldtype': 'Currency',
+		'idx': 3,
+		'label': 'Rate',
+		'oldfieldname': 'rate',
+		'oldfieldtype': 'Currency',
+		'width': '50px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rate_without_pan',
+		'fieldtype': 'Currency',
+		'idx': 4,
+		'label': 'Rate without PAN',
+		'oldfieldname': 'rate_without_pan',
+		'oldfieldtype': 'Currency'
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/tds_return_acknowledgement/tds_return_acknowledgement.txt b/accounts/doctype/tds_return_acknowledgement/tds_return_acknowledgement.txt
index afbdfcd88a..769064d598 100644
--- a/accounts/doctype/tds_return_acknowledgement/tds_return_acknowledgement.txt
+++ b/accounts/doctype/tds_return_acknowledgement/tds_return_acknowledgement.txt
@@ -1 +1,128 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-06-16 10:55:42', 'search_fields': None, 'module': 'Accounts', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'nabin@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 14, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'TDSR/.####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'nabin@webnotestech.com', 'document_type': None, 'name': 'TDS Return Acknowledgement', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM01044', 'parent': 'TDS Return Acknowledgement', 'read': 1, 'create': 1, 'creation': '2010-06-16 11:01:13', 'modified': '2010-09-01 14:18:18', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Accounts User', 'owner': 'nabin@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM01045', 'parent': 'TDS Return Acknowledgement', 'read': 1, 'create': 1, 'creation': '2010-06-16 11:01:13', 'modified': '2010-09-01 14:18:18', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'Accounts Manager', 'owner': 'nabin@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-06-16 10:59:31', 'doctype': 'DocField', 'oldfieldname': 'fiscal_year', 'owner': 'nabin@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Fiscal Year', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Return Acknowledgement', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05380', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-01 14:18:18', 'parenttype': 'DocType', 'fieldname': 'fiscal_year', 'fieldtype': 'Select', 'options': 'link:Fiscal Year', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-06-16 10:59:31', 'doctype': 'DocField', 'oldfieldname': 'quarter', 'owner': 'nabin@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Quarter', 'width': None, 'trigger': 'Client', 'depends_on': '', 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Return Acknowledgement', 'search_index': None, 'allow_on_submit': 0, 'icon': None, 'name': 'FL05379', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-01 14:18:18', 'parenttype': 'DocType', 'fieldname': 'quarter', 'fieldtype': 'Select', 'options': '\nApr-Jun\nJul-Sept\nOct-Dec\nJan-Mar', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-06-16 11:01:54', 'doctype': 'DocField', 'oldfieldname': 'tds_category', 'owner': 'nabin@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'TDS Category', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Return Acknowledgement', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05382', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-01 14:18:18', 'parenttype': 'DocType', 'fieldname': 'tds_category', 'fieldtype': 'Select', 'options': 'link:TDS Category', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-06-16 10:59:31', 'doctype': 'DocField', 'oldfieldname': 'acknowledgement_no', 'owner': 'nabin@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Acknowledgement No', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Return Acknowledgement', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05381', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-09-01 14:18:18', 'parenttype': 'DocType', 'fieldname': 'acknowledgement_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-06-16 11:09:54', 'doctype': 'DocField', 'oldfieldname': 'date_of_receipt', 'owner': 'nabin@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Date of Receipt', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'TDS Return Acknowledgement', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05383', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-09-01 14:18:18', 'parenttype': 'DocType', 'fieldname': 'date_of_receipt', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, TDS Return Acknowledgement
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:27',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'nabin@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'TDSR/.####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'Accounts',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 13
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'TDS Return Acknowledgement',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'TDS Return Acknowledgement',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'write': 1
+	},
+
+	# DocType, TDS Return Acknowledgement
+	{
+		'doctype': 'DocType',
+		'name': 'TDS Return Acknowledgement'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'Accounts User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'Accounts Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 0,
+		'doctype': 'DocField',
+		'fieldname': 'quarter',
+		'fieldtype': 'Select',
+		'idx': 2,
+		'label': 'Quarter',
+		'oldfieldname': 'quarter',
+		'oldfieldtype': 'Select',
+		'options': '\nApr-Jun\nJul-Sept\nOct-Dec\nJan-Mar',
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tds_category',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'TDS Category',
+		'oldfieldname': 'tds_category',
+		'oldfieldtype': 'Select',
+		'options': 'link:TDS Category'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'acknowledgement_no',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'Acknowledgement No',
+		'oldfieldname': 'acknowledgement_no',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'date_of_receipt',
+		'fieldtype': 'Date',
+		'idx': 5,
+		'label': 'Date of Receipt',
+		'oldfieldname': 'date_of_receipt',
+		'oldfieldtype': 'Date'
+	}
+]
\ No newline at end of file
diff --git a/accounts/page/accounts_browser/accounts_browser.txt b/accounts/page/accounts_browser/accounts_browser.txt
index 82da806a46..70652e0d0b 100644
--- a/accounts/page/accounts_browser/accounts_browser.txt
+++ b/accounts/page/accounts_browser/accounts_browser.txt
@@ -1 +1,44 @@
-[{'creation': '2009-03-12 12:09:24', 'module': 'Accounts', 'doctype': 'Page', 'owner': 'Administrator', 'style': None, 'modified_by': 'nabin@webnotestech.com', 'script': None, 'show_in_menu': 0, 'content': None, 'page_name': 'Accounts Browser', 'menu_index': None, 'docstatus': 0, 'parent': None, 'standard': 'Yes', 'icon': '', 'name': 'Accounts Browser', 'idx': None, 'static_content': None, 'modified': '2010-11-18 17:00:21', 'parenttype': None, 'parent_node': None, 'parentfield': None}, {'modified_by': 'nabin@webnotestech.com', 'name': 'PR000004', 'parent': 'Accounts Browser', 'creation': '2009-03-12 12:09:24', 'modified': '2010-11-18 17:00:21', 'doctype': 'Page Role', 'idx': 1, 'parenttype': 'Page', 'role': 'Accounts User', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': 'roles'}]
\ No newline at end of file
+# Page, Accounts Browser
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-12-14 10:23:28',
+		'docstatus': 0,
+		'modified': '2010-12-29 12:57:23',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
+		'module': 'Accounts',
+		'name': '__common__',
+		'page_name': 'Accounts Browser',
+		'show_in_menu': 0,
+		'standard': 'Yes'
+	},
+
+	# These values are common for all Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'Accounts Browser',
+		'parentfield': 'roles',
+		'parenttype': 'Page',
+		'role': 'Accounts User'
+	},
+
+	# Page, Accounts Browser
+	{
+		'doctype': 'Page',
+		'name': 'Accounts Browser'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role'
+	}
+]
\ No newline at end of file
diff --git a/accounts/page/financial_statements/financial_statements.txt b/accounts/page/financial_statements/financial_statements.txt
index b8d972ff4b..6f64c1ba00 100644
--- a/accounts/page/financial_statements/financial_statements.txt
+++ b/accounts/page/financial_statements/financial_statements.txt
@@ -1 +1,58 @@
-[{'creation': '2009-03-12 12:09:24', 'module': 'Accounts', 'doctype': 'Page', 'owner': 'Administrator', 'style': None, 'modified_by': 'Administrator', 'script': None, 'show_in_menu': 0, 'content': None, 'page_name': 'Financial Statements', 'menu_index': None, 'docstatus': 0, 'parent': None, 'standard': 'Yes', 'icon': '', 'name': 'Financial Statements', 'idx': None, 'static_content': None, 'modified': '2010-09-25 00:00:00', 'parenttype': None, 'parent_node': None, 'parentfield': None}, {'modified_by': 'Administrator', 'name': 'PR000005', 'parent': 'Financial Statements', 'creation': '2009-03-12 12:09:24', 'modified': '2010-04-08 12:28:01', 'doctype': 'Page Role', 'idx': 1, 'parenttype': 'Page', 'role': 'Accounts User', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': 'roles'}, {'modified_by': 'Administrator', 'name': 'PR000016', 'parent': 'Financial Statements', 'creation': '2009-06-04 15:16:31', 'modified': '2010-03-29 13:40:15', 'doctype': 'Page Role', 'idx': 2, 'parenttype': 'Page', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': 'roles'}, {'modified_by': 'Administrator', 'name': 'PR000051', 'parent': 'Financial Statements', 'creation': '2009-09-23 16:34:18', 'modified': '2010-03-29 13:40:15', 'doctype': 'Page Role', 'idx': 3, 'parenttype': 'Page', 'role': 'Accounts Manager', 'owner': 'nabin@webnotestech.com', 'docstatus': 0, 'parentfield': 'roles'}]
\ No newline at end of file
+# Page, Financial Statements
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-10-12 15:19:32',
+		'docstatus': 0,
+		'modified': '2011-01-03 17:32:30',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
+		'module': 'Accounts',
+		'name': '__common__',
+		'page_name': 'Financial Statements',
+		'show_in_menu': 0,
+		'standard': 'Yes'
+	},
+
+	# These values are common for all Page Role
+	{
+		'doctype': 'Page Role',
+		'name': '__common__',
+		'parent': 'Financial Statements',
+		'parentfield': 'roles',
+		'parenttype': 'Page'
+	},
+
+	# Page, Financial Statements
+	{
+		'doctype': 'Page',
+		'name': 'Financial Statements'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 1,
+		'role': 'Accounts User'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 2,
+		'role': 'Administrator'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 3,
+		'role': 'Accounts Manager'
+	}
+]
\ No newline at end of file
diff --git a/accounts/search_criteria/account___inputs_rg_23_a___part_ii_wrong_one/account___inputs_rg_23_a___part_ii_wrong_one.txt b/accounts/search_criteria/account___inputs_rg_23_a___part_ii_wrong_one/account___inputs_rg_23_a___part_ii_wrong_one.txt
deleted file mode 100644
index f4101d4718..0000000000
--- a/accounts/search_criteria/account___inputs_rg_23_a___part_ii_wrong_one/account___inputs_rg_23_a___part_ii_wrong_one.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company,GL Entry\x01Lft,GL Entry\x01Rgt',
-		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Account - Inputs (R.G. 23 A - PART II) Wrong One',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'GL Entry',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':'','GL Entry\x01Company':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-03-20 17:02:13',
-		'modified_by': 'Administrator',
-		'module': 'Accounts',
-		'name': 'account_-_inputs_rg_23_a_-_part_ii_wrong_one',
-		'owner': 'jai@webnotestech.com',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
-		'sort_by': 'ID',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/accounts/search_criteria/budget_variance_report1/budget_variance_report1.js b/accounts/search_criteria/budget_variance_report1/budget_variance_report1.js
deleted file mode 100644
index b7cd6e452b..0000000000
--- a/accounts/search_criteria/budget_variance_report1/budget_variance_report1.js
+++ /dev/null
@@ -1,9 +0,0 @@
-report.customize_filters = function() {
-  this.hide_all_filters();
-  this.add_filter({fieldname:'fiscal_year', label:'Fiscal Year', fieldtype:'Link', options:'Fiscal Year', report_default:sys_defaults.fiscal_year, parent:'Budget Detail'});
-  this.add_filter({fieldname:'company', label:'Company', fieldtype:'Link', options:'Company',report_default:sys_defaults.company, ignore : 1, parent:'Budget Detail'});
-  this.add_filter({fieldname:'period', label:'Period', fieldtype:'Select', options:'Monthly'+NEWLINE+'Quarterly'+NEWLINE+'Half Yearly'+NEWLINE+'Annual',report_default:'Quarterly',ignore : 1, parent:'Budget Detail'});
-  this.add_filter({fieldname:'cost_center', label:'Cost Center', fieldtype:'Link', options:'Cost Center', parent:'Budget Detail'});
-  this.add_filter({fieldname:'account_head', label:'Account', fieldtype:'Link', options:'Account', parent:'Budget Detail'});
-}
-this.mytabs.items['Select Columns'].hide()
\ No newline at end of file
diff --git a/accounts/search_criteria/budget_variance_report1/budget_variance_report1.py b/accounts/search_criteria/budget_variance_report1/budget_variance_report1.py
deleted file mode 100644
index 97a0c22dba..0000000000
--- a/accounts/search_criteria/budget_variance_report1/budget_variance_report1.py
+++ /dev/null
@@ -1,88 +0,0 @@
-# use This in Query 
-# AND `tabAccount`.debit_or_credit = "Debit" AND `tabAccount`.`is_pl_account` = "Yes"
-
-
-
-# validate Filters
-if not filter_values.get('fiscal_year'):
-  msgprint("Please Select Fiscal Year")
-  raise Exception
-if not filter_values.get('period'):
-  msgprint("Please Select Period")
-  raise Exception
-  
-# Get Values from fliters 
-fiscal_year = filter_values.get('fiscal_year')
-period = filter_values.get('period')
-
-mon_list = []
-data = {'start_date':0, 'end_date':1}
-def make_month_list(append_colnames, start_date, mon_list, period, colnames, coltypes, colwidths, coloptions, col_idx):
-  count = 1
-  if period == 'Quarterly' or period == 'Half Yearly' or period == 'Annual': mon_list.append([str(start_date)])
-  for m in range(12):
-    # get last date
-    last_date = str(sql("select LAST_DAY('%s')" % start_date)[0][0])
-    
-    # make mon_list
-    if period == 'Monthly' :
-      mon_list.append([start_date, last_date])
-      # add months as Column names
-      month_name = sql("select MONTHNAME('%s')" % start_date)[0][0]
-      append_colnames(str(month_name)[:3], colnames, coltypes, colwidths, coloptions, col_idx)
-      
-    # get start date
-    start_date = str(sql("select DATE_ADD('%s',INTERVAL 1 DAY)" % last_date)[0][0])
-    if period == 'Quarterly' and count % 3 == 0: 
-     
-      mon_list[len(mon_list) - 1 ].append(last_date)
-      # add Column names
-      append_colnames('Q '+ str(count / 3), colnames, coltypes, colwidths, coloptions, col_idx)
-      if count != 12: mon_list.append([start_date])
-    
-    if period == 'Half Yearly' and count % 6 == 0 :
-      mon_list[len(mon_list) - 1 ].append(last_date)
-      # add Column Names
-      append_colnames('H'+str(count / 6), colnames, coltypes, colwidths, coloptions, col_idx)
-      if count != 12: mon_list.append([start_date])
-    if period == 'Annual' and count % 12 == 0:
-      mon_list[len(mon_list) - 1 ].append(last_date)
-      append_colnames('', colnames, coltypes, colwidths, coloptions, col_idx)
-    count = count +1
-
-def append_colnames(name, colnames, coltypes, colwidths, coloptions, col_idx):
-  col = ['Budget', 'Actual', 'Variance']
-  for c in col:
-    colnames.append(str(c) + ' (' + str(name) +')' )
-    coltypes.append('Currency')
-    colwidths.append('150px')
-    coloptions.append('')
-    col_idx[str(c) + ' (' + str(name) +')' ] = len(colnames) - 1
-
-col = ['Cost Center', 'Account', 'Budget Allocated', 'Distribution Id']
-for c in col:
-  colnames.append(str(c))
-  coltypes.append((c=='Budget Allocated') and'Currency' or 'Link')
-  colwidths.append('150px')
-  coloptions.append((c=='Budget Allocated') and '' or (c == 'Distribution Id') and 'Budget Distribution' or c) 
-  col_idx[str(c)] = len(colnames) - 1
-
-start_date = get_value('Fiscal Year', fiscal_year, 'year_start_date')
-if not start_date:
-  msgprint("Please Define Year Start Date for Fiscal Year " + str(fiscal_year))
-  raise Exception
-start_date = start_date.strftime('%Y-%m-%d')
-make_month_list(append_colnames, start_date, mon_list, period, colnames, coltypes, colwidths, coloptions, col_idx)
-
-# Get Object Of GL Control
-
-glc_obj = get_obj('GL Control')
-bc_obj = get_obj('Budget Control')
-
-for r in res:
-  count = 0
-  for idx in range(4, len(colnames), 3):
-    r.append(bc_obj.get_monthly_budget( r[3], fiscal_year, mon_list[count][data['start_date']], mon_list[count][data['end_date']], r[2]))
-    r.append(glc_obj.get_period_difference(r[1] + '~~~' + mon_list[count][data['start_date']] + '~~~' + mon_list[count][data['end_date']], r[0]))
-    r.append(r[idx] - r[idx + 1])
-    count = count +1
diff --git a/accounts/search_criteria/budget_variance_report1/budget_variance_report1.sql b/accounts/search_criteria/budget_variance_report1/budget_variance_report1.sql
deleted file mode 100644
index 98b71dcd94..0000000000
--- a/accounts/search_criteria/budget_variance_report1/budget_variance_report1.sql
+++ /dev/null
@@ -1 +0,0 @@
-select t2.name, t1.account, t1.budget_allocated, t1.distribution_id from `tabBudget Detail` t1, `tabCost Center` t2 where t1.fiscal_year = '%(fiscal_year)s' and t1.parent = t2.name and t2.name like '%(cost_center)s%%' and t1.account like '%(account_head)s%%' and t2.docstatus != 2
\ No newline at end of file
diff --git a/accounts/search_criteria/budget_variance_report1/budget_variance_report1.txt b/accounts/search_criteria/budget_variance_report1/budget_variance_report1.txt
deleted file mode 100644
index 5f13673673..0000000000
--- a/accounts/search_criteria/budget_variance_report1/budget_variance_report1.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Cost Center\x01ID,Budget Detail\x01Account,Budget Detail\x01Fiscal Year,Budget Detail\x01Budget Allocated,Budget Detail\x01Actual,Budget Detail\x01Distribution ID',
-		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Budget Variance Report1',
-		'custom_query': None,
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Budget Detail',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Budget Detail\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-07-28 14:52:44',
-		'modified_by': 'Administrator',
-		'module': 'Accounts',
-		'name': 'budget_variance_report1',
-		'owner': 'jai@webnotestech.com',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': 'Cost Center',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
-		'sort_by': '`tabCost Center`.`name`',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/analysis/doctype/mis_control/mis_control.txt b/analysis/doctype/mis_control/mis_control.txt
index 73038c0b52..3149cde10b 100644
--- a/analysis/doctype/mis_control/mis_control.txt
+++ b/analysis/doctype/mis_control/mis_control.txt
@@ -1 +1,31 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-12 12:09:21', 'search_fields': None, 'module': 'Analysis', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 124, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': '', 'name': 'MIS Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-10-25 17:20:04', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
+# DocType, MIS Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:10',
+		'docstatus': 0,
+		'modified': '2011-01-03 17:32:31',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Analysis',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 120
+	},
+
+	# DocType, MIS Control
+	{
+		'doctype': 'DocType',
+		'name': 'MIS Control'
+	}
+]
\ No newline at end of file
diff --git a/analysis/doctype/ta_control/ta_control.txt b/analysis/doctype/ta_control/ta_control.txt
index 4822e278ee..d0b03d4b49 100755
--- a/analysis/doctype/ta_control/ta_control.txt
+++ b/analysis/doctype/ta_control/ta_control.txt
@@ -1 +1,32 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2011-01-07 14:56:35', 'search_fields': None, 'module': 'Analysis', 'doctype': 'DocType', 'change_log': None, 'print_outline': None, 'owner': 'Administrator', 'in_dialog': None, 'in_create': 1, 'read_only': 1, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 1, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'TA Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2011-01-07 14:56:35', 'server_code_error': None, 'name_case': None, 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
+# DocType, TA Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-11-09 09:35:22',
+		'docstatus': 0,
+		'modified': '2010-12-02 18:00:30',
+		'modified_by': 'Administrator',
+		'owner': 'saumil@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 1,
+		'issingle': 1,
+		'module': 'Analysis',
+		'name': '__common__',
+		'read_only': 1,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 11
+	},
+
+	# DocType, TA Control
+	{
+		'doctype': 'DocType',
+		'name': 'TA Control'
+	}
+]
\ No newline at end of file
diff --git a/application_internal/DocType Label/Payable Voucher/Payable Voucher.txt b/application_internal/DocType Label/Payable Voucher/Payable Voucher.txt
deleted file mode 100644
index 37c89a0afd..0000000000
--- a/application_internal/DocType Label/Payable Voucher/Payable Voucher.txt	
+++ /dev/null
@@ -1 +0,0 @@
-[{'modified_by': 'Administrator', 'name': 'Payable Voucher', 'parent': None, 'dt_label': 'Purchase Invoice', 'creation': '2010-06-10 10:44:55', 'modified': '2010-06-10 10:44:55', 'module': 'Application Internal', 'doctype': 'DocType Label', 'idx': None, 'parenttype': None, 'owner': 'Administrator', 'docstatus': 0, 'dt': 'Payable Voucher', 'parentfield': None}]
\ No newline at end of file
diff --git a/application_internal/DocType Label/Receivable Voucher/Receivable Voucher.txt b/application_internal/DocType Label/Receivable Voucher/Receivable Voucher.txt
deleted file mode 100644
index b09e59d750..0000000000
--- a/application_internal/DocType Label/Receivable Voucher/Receivable Voucher.txt	
+++ /dev/null
@@ -1 +0,0 @@
-[{'modified_by': 'Administrator', 'name': 'Receivable Voucher', 'parent': None, 'dt_label': 'Sales Invoice', 'creation': '2010-06-10 10:44:40', 'modified': '2010-06-10 10:44:40', 'module': 'Application Internal', 'doctype': 'DocType Label', 'idx': None, 'parenttype': None, 'owner': 'Administrator', 'docstatus': 0, 'dt': 'Receivable Voucher', 'parentfield': None}]
\ No newline at end of file
diff --git a/application_internal/Module Def/Application Internal/Application Internal.txt b/application_internal/Module Def/Application Internal/Application Internal.txt
deleted file mode 100644
index a966e825af..0000000000
--- a/application_internal/Module Def/Application Internal/Application Internal.txt	
+++ /dev/null
@@ -1,218 +0,0 @@
-[
-	{
-		'_last_update': None,
-		'creation': '2010-11-30 17:30:06',
-		'disabled': 'No',
-		'docstatus': 0,
-		'doctype': 'Module Def',
-		'doctype_list': 'DocType Label, Payable Voucher\nDocType Label, Receivable Voucher',
-		'file_list': None,
-		'idx': None,
-		'is_hidden': None,
-		'last_updated_date': '2010-11-29 12:02:02',
-		'modified': '2010-09-25 00:00:00',
-		'modified_by': 'Administrator',
-		'module_desc': None,
-		'module_icon': None,
-		'module_label': 'Application Internal',
-		'module_name': 'Application Internal',
-		'module_page': None,
-		'module_seq': None,
-		'name': 'Application Internal',
-		'owner': 'Administrator',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
-		'trash_reason': None,
-		'widget_code': None
-	},
-	{
-		'click_function': None,
-		'creation': '2010-11-30 17:30:06',
-		'description': None,
-		'display_name': 'Code History',
-		'doc_name': 'Code History',
-		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': None,
-		'modified': '2011-03-24 15:04:46',
-		'modified_by': 'Administrator',
-		'name': 'MDI00016',
-		'owner': 'Administrator',
-		'parent': 'Application Internal',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2010-11-30 17:30:06',
-		'description': None,
-		'display_name': 'DocType Label',
-		'doc_name': 'DocType Label',
-		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': None,
-		'modified': '2011-03-24 15:04:46',
-		'modified_by': 'Administrator',
-		'name': 'MDI00017',
-		'owner': 'Administrator',
-		'parent': 'Application Internal',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2010-11-30 17:30:06',
-		'description': None,
-		'display_name': 'DocType Mapper',
-		'doc_name': 'DocType Mapper',
-		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': None,
-		'modified': '2011-03-24 15:04:46',
-		'modified_by': 'Administrator',
-		'name': 'MDI00018',
-		'owner': 'Administrator',
-		'parent': 'Application Internal',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2010-11-30 17:30:06',
-		'description': None,
-		'display_name': 'Form Settings',
-		'doc_name': 'Form Settings',
-		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': None,
-		'modified': '2011-03-24 15:04:46',
-		'modified_by': 'Administrator',
-		'name': 'MDI00019',
-		'owner': 'Administrator',
-		'parent': 'Application Internal',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2010-11-30 17:30:06',
-		'description': None,
-		'display_name': 'GL Mapper',
-		'doc_name': 'GL Mapper',
-		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': None,
-		'modified': '2011-03-24 15:04:46',
-		'modified_by': 'Administrator',
-		'name': 'MDI00020',
-		'owner': 'Administrator',
-		'parent': 'Application Internal',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2010-11-30 17:30:06',
-		'description': None,
-		'display_name': 'Impact Analysis',
-		'doc_name': 'Impact Analysis',
-		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': None,
-		'modified': '2011-03-24 15:04:46',
-		'modified_by': 'Administrator',
-		'name': 'MDI00021',
-		'owner': 'Administrator',
-		'parent': 'Application Internal',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2010-11-30 17:30:06',
-		'description': None,
-		'display_name': 'Rating Template',
-		'doc_name': 'Rating Template',
-		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': None,
-		'modified': '2011-03-24 15:04:46',
-		'modified_by': 'Administrator',
-		'name': 'MDI00022',
-		'owner': 'Administrator',
-		'parent': 'Application Internal',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2010-11-30 17:30:06',
-		'description': None,
-		'display_name': 'Search Criteria',
-		'doc_name': 'Search Criteria',
-		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': None,
-		'modified': '2011-03-24 15:04:46',
-		'modified_by': 'Administrator',
-		'name': 'MDI00023',
-		'owner': 'Administrator',
-		'parent': 'Application Internal',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 15:04:46',
-		'description': None,
-		'display_name': None,
-		'doc_name': 'Forms',
-		'doc_type': 'Separator',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': None,
-		'modified': '2011-03-24 15:04:46',
-		'modified_by': 'Administrator',
-		'name': '000003078',
-		'owner': 'Administrator',
-		'parent': 'Application Internal',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	}
-]
\ No newline at end of file
diff --git a/application_internal/doctype/code_editor/code_editor.js b/application_internal/doctype/code_editor/code_editor.js
deleted file mode 100644
index 8ab1c4ffd2..0000000000
--- a/application_internal/doctype/code_editor/code_editor.js
+++ /dev/null
@@ -1,204 +0,0 @@
-
-// get the script
-loadscript("js/edit_area/edit_area_full.js", function() { });
-
-// property div
-cur_frm.fields_dict['Property HTML'].prop_div = $a(cur_frm.fields_dict['Property HTML'].wrapper,'div','',{margin:'8px 0px'});
-
-// comment div
-cur_frm.cscript.comment_div = $a(cur_frm.fields_dict['Code Toolbar'].wrapper,'div','',{display: 'none', marginBottom:'8px', width: '90%', backgroundColor: '#FFD', fontSize: '14px', padding:'4px'})
-
-// field master
-cur_frm.cscript.type_fields = {
-  'DocType': 'doc_type'
-  ,'Page': 'page_name'
-  ,'Search Criteria': 'criteria_id'
-  ,'Print Format': 'print_format'
-}
-
-// syntax master
-// -------------
-cur_frm.cscript.code_syntax = {
-  // --- DocType   
-   client_script:'js'
-  ,client_script_core:'js'
-  ,server_code:'python'
-  ,server_code_core:'python'  
-
-  // --- Page
-  ,content:'html'
-  ,script:'js'
-  ,style:'css'
-
-  // --- Search Criteria
-  ,report_script:'js'
-  ,server_script:'python'
-
-  // --- Print Format
-  ,code:'html'
-}
-
-// get field name of code
-// ----------------------
-
-cur_frm.cscript.get_field_name = function(doc) {
-  // field names
-  if(doc.script_from =='DocType') {
-    var code_field = doc.code_type.toLowerCase().replace(/ /g,'_');
-  } else if(doc.script_from =='Page') {
-    var code_field = doc.code_type_page.toLowerCase().replace(/ /g,'_');
-  } else if(doc.script_from =='Search Criteria') {
-    var code_field = doc.code_type_criteria.toLowerCase().replace(/ /g,'_');
-  } else if(doc.script_from =='Print Format') {
-    var code_field = 'html';
-  }
-  return code_field;
-}
-
-// update comment
-// --------------
-cur_frm.cscript.update_comment = function() {
-  var ce = cur_frm.cscript.cur_editor;
-  if(!ce) return;
-  var c = cur_frm.cscript.comment_div;
-  c.innerHTML = "Currently Editing '" + ce.fn + "' from " + ce.dt + " " + ce.dn + " (Last Modified: " + ce.code_modified + ")";
-  if(ce.saved)
-    c.innerHTML += "
Saved"
-  else
-    c.innerHTML += "
Changes are not saved"
-
-  $ds(c);
-}
-
-// get code button
-// ---------------
-cur_frm.cscript.get_code = function() {
-  var doc = locals[cur_frm.doctype][cur_frm.docname];
-
-  if(!editAreaLoader) {
-    msgprint('Waiting for the editor to load. Please try again');
-    return;
-  }
-
-  if(cur_frm.cscript.cur_editor && (!cur_frm.cscript.cur_editor.saved)) {
-    if(!confirm("Current script not saved. Do you want to continue?")) return;
-  }
-
-  // field names
-  var code_field = cur_frm.cscript.get_field_name(doc);
-
-  var callback = function(r, rt) {
-
-    cur_frm.cscript.make_editor(cur_frm.cscript.code_syntax[code_field]);
-    editAreaLoader.setValue(cur_frm.cscript.cur_editor.editor_id, r.message[0]);
-    
-    var ce = cur_frm.cscript.cur_editor;
-
-    ce.code_modified = r.message[1];
-    ce.dt = doc.script_from;
-    ce.dn = doc[cur_frm.cscript.type_fields[doc.script_from]];
-    ce.fn = code_field;
-    ce.saved = 1;
-    cur_frm.cscript.update_comment();
-  }
-  $c_obj([doc], 'get_code', [doc.script_from, doc[cur_frm.cscript.type_fields[doc.script_from]], code_field].join('~~~'), callback);
-}
-
-// make a new editor
-// -----------------
-
-cur_frm.cscript.make_editor = function(syntax) {
-
-  // hide editor if exists
-  if(cur_frm.cscript.cur_editor) {
-  }
-
-  // set id
-  var myid = 'code_edit_1' //+ cur_frm.cscript.mycnt;
-
-  editAreaLoader.init({id: myid, start_highlight: true, word_wrap: false, syntax: syntax
-    ,change_callback : "cur_frm.cscript.editor_change_callback"
-    ,EA_load_callback: "cur_frm.cscript.editor_load_callback"
-  });
-  editAreaLoader.window_loaded(); // make the editor
-
-  if(!cur_frm.cscript.cur_editor) { 
-
-    // parent
-    var div = $a(cur_frm.fields_dict['Code HTML'].wrapper,'div');
-    div.editor_id = myid;
-
-    // make the form
-    div.innerHTML = '
';
-
-    div.form = div.childNodes[0];
-
-    // make the text area
-    div.ta = $a(div.form,'textarea','',{height: '400px'}); div.ta.setAttribute('id',myid);
-
-    cur_frm.cscript.cur_editor = div;
-  }
-}
-
-cur_frm.cscript.editor_change_callback = function(id) {
-  cur_frm.cscript.cur_editor.saved = 0; cur_frm.cscript.update_comment();
-}
-
-cur_frm.cscript.editor_load_callback = function(id) {
-  cur_frm.cscript.cur_editor.saved = 1; cur_frm.cscript.update_comment();
-}
-
-// get properties 
-// --------------
-cur_frm.cscript.get_properties = function() {
-  var callback = function(r,rt) {
-    var div = cur_frm.fields_dict['Property HTML'].prop_div;
-    div.innerHTML = '';
-    
-    var t = make_table(div, r.message.length, 4, '90%', ['25%','25%','25%','25%'], {padding: '3px'})
-    var cl = r.message;
-    for(var i=0; iCode Editor', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-11-04 13:46:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code Editor', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03266', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-04-16 15:06:58', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-11-04 13:46:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Code Hidden', 'width': None, 'trigger': None, 'depends_on': 'fn:test', 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Code Editor', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03267', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-04-16 15:06:58', 'parenttype': 'DocType', 'fieldname': 'code', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-11-04 13:46:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Script From', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code Editor', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03268', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-04-16 15:06:58', 'parenttype': 'DocType', 'fieldname': 'script_from', 'fieldtype': 'Select', 'options': 'DocType\nPage\nSearch Criteria\nPrint Format', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-11-04 13:46:32', 'doctype': 'DocField', 'oldfieldname': 'doc_type', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Doc Type', 'width': None, 'trigger': '', 'depends_on': 'fn:is_doctype', 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code Editor', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03269', 'idx': 5, 'default': None, 'colour': 'White:FFF', 'modified': '2010-04-16 15:06:58', 'parenttype': 'DocType', 'fieldname': 'doc_type', 'fieldtype': 'Select', 'options': 'link:DocType', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-11-04 13:46:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Page Name', 'width': None, 'trigger': None, 'depends_on': 'fn:is_page', 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code Editor', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03270', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-04-16 15:06:58', 'parenttype': 'DocType', 'fieldname': 'page_name', 'fieldtype': 'Select', 'options': 'link:Page', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-11-04 13:46:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Criteria ID', 'width': None, 'trigger': None, 'depends_on': 'fn:is_criteria', 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code Editor', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03271', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-04-16 15:06:58', 'parenttype': 'DocType', 'fieldname': 'criteria_id', 'fieldtype': 'Link', 'options': 'Search Criteria', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-11-04 13:46:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Print Format', 'width': None, 'trigger': None, 'depends_on': 'fn:is_print_format', 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code Editor', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03272', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-04-16 15:06:58', 'parenttype': 'DocType', 'fieldname': 'print_format', 'fieldtype': 'Select', 'options': 'link:Print Format', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-11-04 13:46:32', 'doctype': 'DocField', 'oldfieldname': 'select', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Code Type - DocType', 'width': None, 'trigger': None, 'depends_on': 'fn:is_doctype', 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code Editor', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03273', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-04-16 15:06:58', 'parenttype': 'DocType', 'fieldname': 'code_type', 'fieldtype': 'Select', 'options': 'Server Code Core\nClient Script Core\nServer Code\nClient Script', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-11-04 13:46:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Code Type - Page', 'width': None, 'trigger': None, 'depends_on': 'fn:is_page', 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code Editor', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03274', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-04-16 15:06:58', 'parenttype': 'DocType', 'fieldname': 'code_type_page', 'fieldtype': 'Select', 'options': 'Script\nStyle\nContent', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-11-04 13:46:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Code Type - Search Criteria', 'width': None, 'trigger': None, 'depends_on': 'fn:is_criteria', 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code Editor', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03275', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-04-16 15:06:58', 'parenttype': 'DocType', 'fieldname': 'code_type_criteria', 'fieldtype': 'Select', 'options': 'Server Script\nReport Script', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-11-04 13:46:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Code Toolbar', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code Editor', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03276', 'idx': 12, 'default': None, 'colour': 'White:FFF', 'modified': '2010-04-16 15:06:58', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': '
\n\n\n\n
', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-11-05 10:02:27', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Add to history', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code Editor', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03288', 'idx': 13, 'default': None, 'colour': None, 'modified': '2010-04-16 15:06:58', 'parenttype': 'DocType', 'fieldname': 'add_to_history', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-11-04 13:46:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Code HTML', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code Editor', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03277', 'idx': 14, 'default': None, 'colour': None, 'modified': '2010-04-16 15:06:58', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-11-04 13:46:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code Editor', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03278', 'idx': 15, 'default': None, 'colour': None, 'modified': '2010-04-16 15:06:58', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-11-04 13:46:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Property Head', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code Editor', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03279', 'idx': 16, 'default': None, 'colour': None, 'modified': '2010-04-16 15:06:58', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': '
Property Reference
', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-11-04 13:46:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Select DocType', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code Editor', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03280', 'idx': 17, 'default': None, 'colour': None, 'modified': '2010-04-16 15:06:58', 'parenttype': 'DocType', 'fieldname': 'select_doctype', 'fieldtype': 'Select', 'options': 'link:DocType', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-11-04 13:46:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Property Toolbar', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code Editor', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03281', 'idx': 18, 'default': None, 'colour': None, 'modified': '2010-04-16 15:06:58', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': '
\n\n
', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-11-04 13:46:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Property HTML', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code Editor', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03282', 'idx': 19, 'default': None, 'colour': None, 'modified': '2010-04-16 15:06:58', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/application_internal/doctype/code_history/code_history.txt b/application_internal/doctype/code_history/code_history.txt
deleted file mode 100644
index 25ee9355e5..0000000000
--- a/application_internal/doctype/code_history/code_history.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-11-04 13:46:36', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 3, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': '_CH.#######', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Code History', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00499', 'parent': 'Code History', 'read': 1, 'create': None, 'creation': '2009-11-04 13:46:36', 'modified': '2010-03-31 11:15:39', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-04 13:46:37', 'doctype': 'DocField', 'oldfieldname': 'script_from', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Script From', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code History', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL03283', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-03-31 11:15:39', 'parenttype': 'DocType', 'fieldname': 'script_from', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-04 13:46:37', 'doctype': 'DocField', 'oldfieldname': 'record_id', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Record ID', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code History', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL03284', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-03-31 11:15:39', 'parenttype': 'DocType', 'fieldname': 'record_id', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-04 13:46:37', 'doctype': 'DocField', 'oldfieldname': 'field_name', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Field Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code History', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL03285', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-03-31 11:15:39', 'parenttype': 'DocType', 'fieldname': 'field_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-11-04 13:46:37', 'doctype': 'DocField', 'oldfieldname': 'comment', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Comment', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code History', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL03286', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-03-31 11:15:39', 'parenttype': 'DocType', 'fieldname': 'comment', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Code', 'creation': '2009-11-04 13:46:37', 'doctype': 'DocField', 'oldfieldname': 'code', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Code', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Code History', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03287', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-03-31 11:15:39', 'parenttype': 'DocType', 'fieldname': 'code', 'fieldtype': 'Code', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/application_internal/doctype/doctype_property_setter/doctype_property_setter.txt b/application_internal/doctype/doctype_property_setter/doctype_property_setter.txt
deleted file mode 100644
index c2d47a5c8d..0000000000
--- a/application_internal/doctype/doctype_property_setter/doctype_property_setter.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-11-30 22:45:10', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 4, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': '', 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'DocType Property Setter', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00646', 'parent': 'DocType Property Setter', 'read': 1, 'create': 1, 'creation': '2010-11-30 22:45:10', 'modified': '2010-11-30 22:45:10', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-11-30 22:45:10', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Select DocType', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'DocType Property Setter', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03525', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-11-30 22:45:10', 'parenttype': 'DocType', 'fieldname': 'select_doctype', 'fieldtype': 'Select', 'options': 'link:DocType', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-11-30 22:45:10', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Get Details', 'width': None, 'trigger': 'Server', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'DocType Property Setter', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03526', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-11-30 22:45:10', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'get_details', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-11-30 22:45:10', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Module', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'DocType Property Setter', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03527', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-11-30 22:45:10', 'parenttype': 'DocType', 'fieldname': 'module', 'fieldtype': 'Link', 'options': 'Module Def', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-11-30 22:45:10', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Autoname', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'DocType Property Setter', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03528', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-11-30 22:45:10', 'parenttype': 'DocType', 'fieldname': 'autoname', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-11-30 22:45:10', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Page Style', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'DocType Property Setter', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03529', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-11-30 22:45:10', 'parenttype': 'DocType', 'fieldname': 'page_style', 'fieldtype': 'Select', 'options': 'Simple\nTabbed\nTray', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-11-30 22:45:10', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Show Print Format First', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'DocType Property Setter', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03530', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-11-30 22:45:10', 'parenttype': 'DocType', 'fieldname': 'show_print_format_first', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-11-30 22:45:10', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'DocType Property Setter', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03531', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-11-30 22:45:10', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Text Editor', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-11-30 22:45:10', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Update', 'width': None, 'trigger': 'Server', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'DocType Property Setter', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03532', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-11-30 22:45:10', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Button', 'options': 'update_dt', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/application_internal/doctype/documentation/documentation.txt b/application_internal/doctype/documentation/documentation.txt
deleted file mode 100644
index 6295434e90..0000000000
--- a/application_internal/doctype/documentation/documentation.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-09-11 12:51:55', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 5, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': 'index_html = \'\'\'\n  
\n    \n      \n        \n                \n      \n    
%s%s
%s\n  
\n\'\'\'\n\nmod_html = \'\'\'\n    
\n      \n        \n          \n          \n        \n      
%s%s
%s\n    
\n\'\'\'\n\nreport_html = \'\'\'\n  
\n    \n      \n        \n        \n      \n    
%s%s
\n  
\n\'\'\'\n\ndoc_html=\'\'\'\n    
\n      \n        \n          \n          \n        \n      
%s%s
%s\n    
\n\'\'\'\n\ndocsec_html=\'\'\'\n  
\n      \n        \n          \n          \n        \n      
%s%s
%s\n  
\n  
\n  
\n\'\'\'\n\nscreenshot_html=\'\'\'\n  
\n\'\'\'\n\ndocfields_html = \'\'\'\n  
\n    \n      \n        \n      \n      \n          \n      \n    
%s:
%s
\n  
\n\'\'\'\n\ndoctables_html = \'\'\'\n  
\n    \n      \n        \n      \n      \n        \n            \n    
%s
%s
\n  
\n\'\'\'\n\nclass DocType:\n  def __init__(self,doc,doclist=[]):\n    self.doc = doc\n    self.doclist = doclist\n    self.main_html = \'\'\n    self.out = \'\'\n    self.index_html = \'\'\n    \n  def get_doc(self):\n    self.main_html = \'\'\'
%s
%s
\'\'\'\n\n#All modules\n    modules = sql("select module_name from `tabModule Def`")\n    n=0\n    grp_mod_html= \'\'\n    grp_modindex_html = \'\'\n    temp_main_html = \'\'\n    for m in modules:\n      n1=0\n      n = n+1\n      rp_no = 0\n      grp_doc_html=\'\'\'
DocTypes
\'\'\'\n      grp_report_html=\'\'\'
Reports
\'\'\'\n      grp_docindex_html =\'\'\n      reports = sql("select distinct criteria_name from `tabSearch Criteria` where module= \'%s\'" % m[0])\n      doctypes = sql("select name from `tabDocType` where module =\'%s\'" %(m[0]))\n\n      for rp in reports:\n        rp_no +=1\n        grp_report_html += report_html % (str(rp_no), rp[0])\n\n      for d in doctypes:\n        n1 = n1+1\n        n2 = 0\n        sr = \'\'\n        sr= str(n) + \'.\' + str(n1)\n        grp_docsec_html = \'\'\n        grp_secindex_html = \'\'\n        grp_ss_html=\'\'\n        docfields_name = sql("select name,autoname,description,client_script,server_code,client_string from `tabDocType` where name=%s",d[0],as_dict = 1)\n#        docsections = [\'Screenshot\',\'Options\',\'Permissions\',\'Fields\',\'Client Script\', \'Server Script\',\'Client String\']\n        docsections = [\'Options\',\'Permissions\',\'Fields\']        \n        for ds in docsections:\n          n2 = n2+1\n          sr1 = \'\'\n          sr1 = str(n)+\'.\'+str(n1)+\'.\'+str(n2)\n          for df in docfields_name:\n            grp_docfields_html = \'\'\n            if ds == \'Options\':\n              self.out = \'\'\n              if df[\'name\']:\n                grp_docfields_html += docfields_html % (\'0pt none #FFFFFF\',\'#FFFFFF\',\'Name\',str(df[\'name\']))\n              if df[\'autoname\']:             \n                grp_docfields_html += docfields_html % (\'0pt none #FFFFFF\',\'#FFFFFF\',\'AutoName\',str(df[\'autoname\']))\n              if df[\'description\']:\n                grp_docfields_html += docfields_html % (\'0pt none #FFFFFF\',\'#FFFFFF\',\'Description\',str(df[\'description\']))\n          \n            if ds == \'Client Script\':\n              if df[\'client_script\']:\n                cl_sc = df[\'client_script\'].replace(\'<\',\'< \')\n                grp_docfields_html += docfields_html % (\'1pt solid #000\',\'#EBECE4\',\'Code\',cl_sc)\n            if ds == \'Server Script\':\n              if df[\'server_code\']:\n                ser_sc = df[\'server_code\'].replace(\'<\',\'< \')\n                grp_docfields_html += docfields_html % (\'1pt solid #000\',\'#EBECE4\',\'Code\',ser_sc)\n            if ds == \'Client String\':\n              if df[\'client_string\']:\n                cl_str = df[\'client_string\'].replace(\'<\',\'< \')\n                grp_docfields_html += docfields_html % (\'1pt solid #000\',\'#EBECE4\',\'Code\',cl_str)\n\n#for screenshot\n#            if ds == \'Screenshot\':\n #             fname = sql("select file_list from `tabDocType` where name=%s", d[0])[0][0] or \'\'\n  #            fname = fname.split(\',\')[0]\n   #           if fname:\n    #            grp_docfields_html += screenshot_html % (fname)\n              \n#              grp_docsec_html += docsec_html % (str(sr1),ds,grp_ss_html)\n\n#for permission table\n            if ds == \'Permissions\':\n              lbl1 = [\'Level\',\'Role\',\'Read\',\'Write\',\'Create\',\'Submit\',\'Cancel\',\'Amend\',\'Execute\',\'Match\']\n              perm = sql("select `permlevel`,`role`,`read`,`write`,`create`,`submit`,`cancel`,`amend`,`execute`,`match` from `tabDocPerm` where parent=\'%s\' order by idx" % d[0])\n              self.make_table(perm,\'Roles & Permissions\',lbl1)                \n            \n              grp_docfields_html += doctables_html % (\'\', self.out)\n            \n#for table fields\n            if ds == \'Fields\':\n              self.out = \'\'\n              tbl_name = \'\'\n              #Doctype fields\n              lbl = [\'Label\',\'Type\',\'Name\',\'Option\',\'Perm Level\']\n              \n              option1 = sql("select label,fieldtype,fieldname,options,permlevel from `tabDocField` where parent=\'%s\' and fieldtype !=\'Section Break\' and fieldtype != \'Column Break\' order by idx" % d[0])\n\n              self.make_table(option1,d[0],lbl)\n\n              #table fields\n              tbl = sql("select options from `tabDocField` where parent=\'%s\' and fieldtype=\'Table\'" % d[0])\n              for t in tbl:\n                option2 = sql("select label,fieldtype,fieldname,options,permlevel from `tabDocField` where parent=\'%s\' and fieldtype !=\'Section Break\' and fieldtype != \'Column Break\' order by idx" % t[0])\n                self.make_table(option2,t[0],lbl)\n\n              grp_docfields_html +=doctables_html % (\'\', self.out)\n#              grp_docsec_html += docsec_html % (str(sr1),ds,grp_ss_html)\n          grp_docsec_html += docsec_html % (str(sr1), ds, grp_docfields_html)\n          grp_secindex_html += index_html % (\'48px\',\'16px\',\'normal\',str(sr1),ds,\'\')        \n        grp_doc_html += doc_html % (str(sr), d[0], grp_docsec_html)\n        grp_docindex_html += index_html % (\'40px\',\'18px\',\'normal\',str(sr), d[0],grp_secindex_html)      \n      grp_mod_html += mod_html % (str(n),m[0],grp_doc_html)\n      grp_mod_html += grp_report_html\n      grp_modindex_html += \'
\' + index_html % (\'32px\',\'20px\',\'normal\',str(n),m[0],grp_docindex_html)\n\n    self.main_html = self.main_html % (grp_modindex_html, grp_mod_html)\n    return self.main_html\n    \n  def make_table(self,opt,heading,lbl):\n    sr_no = 0\n    self.out += \'
\' + heading + \'
\'\n    self.out += \'\'\'
\n                \n                  \n                    \'\'\'\n\n    for l in lbl:\n      self.out += \'\'\n    self.out +=\'\'\n                  \n    for op in opt:\n      sr_no += 1\n      self.out = self.out + \'\'\n      self.out = self.out + \'\'\n      for i in range(len(lbl)):\n        self.out = self.out + \'\'\n\n    self.out = self.out + \'
Sr\' + l + \'
\'+cstr(sr_no)+\'\'+cstr(op[i])+\'
\'\n    return self.out', 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Documentation', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': "cur_frm.cscript['Print Document'] = function(doc,cdt,cdn){\n  $c('runserverobj',args={'method':'get_doc','docs':compress_doclist([doc])},\n    function(r,rt){\n      get_print_doc(r.message);\n    }\n  );\n}\n\nvar get_print_doc = function(html){\n//  alert('print - ' + html)\n  var w = window.open('');\n  w.document.write(html);\n  w.document.close();\n}", 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00415', 'parent': 'Documentation', 'read': 1, 'create': 1, 'creation': '2009-09-11 12:51:55', 'modified': '2010-03-31 10:33:16', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-09-11 12:51:55', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Print Document', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Documentation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02955', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-03-31 10:33:16', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/application_internal/doctype/form_settings/form_settings.js b/application_internal/doctype/form_settings/form_settings.js
deleted file mode 100644
index bbf9617531..0000000000
--- a/application_internal/doctype/form_settings/form_settings.js
+++ /dev/null
@@ -1,25 +0,0 @@
-cur_frm.fields_dict['doctype_name'].get_query = function(doc){
-  return 'SELECT tabDocType.name FROM tabDocType WHERE (tabDocType.istable != 1 OR tabDocType.istable is null) AND (tabDocType.issingle !=1 OR tabDocType.issingle is null) AND tabDocType.name LIKE "%s"';
-}
-
-cur_frm.fields_dict['report_filter_details'].grid.get_field("field_label_fr").get_query = function(doc){
-  return 'SELECT tabDocField.label FROM tabDocField WHERE tabDocField.parent = "' + doc.doctype_name+ '" AND tabDocField.fieldname is not null AND tabDocField.fieldname != "'+''+'" AND tabDocField.fieldtype != "Table" AND tabDocField.label LIKE "%s"';
-}
-
-cur_frm.fields_dict['report_field_details'].grid.get_field("field_label_fd").get_query = function(doc){
-  return 'SELECT tabDocField.label FROM tabDocField WHERE tabDocField.parent = "' + doc.doctype_name+ '" AND tabDocField.fieldname is not null AND tabDocField.fieldname != "'+''+'" AND tabDocField.fieldtype != "Table" AND tabDocField.label LIKE "%s"';
-}
-
-cur_frm.cscript.field_label_fr = function(doc,cdt,cdn){
-  var d = locals[cdt][cdn];
-  if(d.field_label_fr){
-    get_server_fields('get_filter_details',d.field_label_fr,'report_filter_details',doc,cdt,cdn,1);
-  }
-}
-
-cur_frm.cscript.field_label_fd = function(doc,cdt,cdn){
-  var d = locals[cdt][cdn];
-  if(d.field_label_fd){
-    get_server_fields('get_field_details',d.field_label_fd,'report_field_details',doc,cdt,cdn,1);
-  }
-}
\ No newline at end of file
diff --git a/application_internal/doctype/form_settings/form_settings.py b/application_internal/doctype/form_settings/form_settings.py
deleted file mode 100644
index 8ccf990463..0000000000
--- a/application_internal/doctype/form_settings/form_settings.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# Please edit this list and import only required elements
-import webnotes
-
-from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
-from webnotes.model import db_exists
-from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType
-from webnotes.model.doclist import getlist, copy_doclist
-from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
-from webnotes import session, form, is_testing, msgprint, errprint
-
-set = webnotes.conn.set
-sql = webnotes.conn.sql
-get_value = webnotes.conn.get_value
-in_transaction = webnotes.conn.in_transaction
-convert_to_lists = webnotes.conn.convert_to_lists
-	
-# -----------------------------------------------------------------------------------------
-
-
-class DocType:
-  def __init__(self,doc,doclist=[]):
-    self.doc = doc
-    self.doclist = doclist
-
-  def autoname(self):
-    rep_nm = self.doc.doctype_name + '-' + 'Settings'
-    if sql("select name from `tabForm Settings` where name=%s",rep_nm):
-      msgprint("Settings for this form already created, please open existing form to do any changes.")
-      raise Exception
-    else:
-      self.doc.name = rep_nm
-      
-  def get_filter_details(self,arg=''):
-    dt_det = sql("select label, fieldtype, options, fieldname from tabDocField where parent=%s and label=%s",(self.doc.doctype_name,arg),as_dict=1)
-        
-    ret = {
-      'field_label_fr' : dt_det and dt_det[0]['label'] or '',
-      'field_type_fr'  : dt_det and dt_det[0]['fieldtype'] or '',
-      'options_fr'     : dt_det and dt_det[0]['options'] or '',
-      'field_name_fr'  : dt_det and dt_det[0]['fieldname'] or '',
-      'table_name_fr'  : self.doc.doctype_name 
-    }
-    return cstr(ret)
-    
-  def get_field_details(self,arg=''):
-    dt_det = sql("select label, fieldtype, options, fieldname from tabDocField where parent=%s and label=%s",(self.doc.doctype_name,arg),as_dict=1)
-    ret = {
-      'field_label_fd' : dt_det and dt_det[0]['label'] or '',
-      'field_type_fd'  : dt_det and dt_det[0]['fieldtype'] or '',
-      'options_fd'     : dt_det and dt_det[0]['options'] or '',
-      'field_name_fd'  : dt_det and dt_det[0]['fieldname'] or '',
-      'table_name_fd'  : self.doc.doctype_name 
-    }
-    return cstr(ret)    
\ No newline at end of file
diff --git a/application_internal/doctype/form_settings/form_settings.txt b/application_internal/doctype/form_settings/form_settings.txt
deleted file mode 100644
index 021c4d1f40..0000000000
--- a/application_internal/doctype/form_settings/form_settings.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-05-29 15:13:46', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 30, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Form Settings', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-05-29 15:13:46', 'doctype': 'DocField', 'oldfieldname': 'doctype_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'DocType Name', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Form Settings', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02235', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-03-31 10:11:56', 'parenttype': 'DocType', 'fieldname': 'doctype_name', 'fieldtype': 'Link', 'options': 'DocType', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-06-01 18:37:22', 'doctype': 'DocField', 'oldfieldname': 'is_master', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Is Master', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Form Settings', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02260', 'idx': 2, 'default': 'No', 'colour': None, 'modified': '2010-03-31 10:11:56', 'parenttype': 'DocType', 'fieldname': 'is_master', 'fieldtype': 'Select', 'options': '\nYes\nNo', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2009-05-29 15:13:46', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Report Filters', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Form Settings', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02237', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-03-31 10:11:56', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Table', 'creation': '2009-05-29 15:13:46', 'doctype': 'DocField', 'oldfieldname': 'report_filter_details', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Report Filter Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Form Settings', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02236', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-03-31 10:11:56', 'parenttype': 'DocType', 'fieldname': 'report_filter_details', 'fieldtype': 'Table', 'options': 'Report Filter Detail', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2009-05-29 15:13:46', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Report Fields', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Form Settings', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02238', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-03-31 10:11:56', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Table', 'creation': '2009-05-29 15:13:46', 'doctype': 'DocField', 'oldfieldname': 'report_field_details', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Report Field Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Form Settings', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02239', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-03-31 10:11:56', 'parenttype': 'DocType', 'fieldname': 'report_field_details', 'fieldtype': 'Table', 'options': 'Report Field Detail', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/application_internal/doctype/gl_mapper/gl_mapper.txt b/application_internal/doctype/gl_mapper/gl_mapper.txt
deleted file mode 100644
index 927a322b1a..0000000000
--- a/application_internal/doctype/gl_mapper/gl_mapper.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-12 12:09:20', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 2, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': 'field:doc_type', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'GL Mapper', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00034', 'parent': 'GL Mapper', 'read': 1, 'create': 0, 'creation': '2009-03-12 12:09:20', 'modified': '2010-04-08 12:29:12', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 1, 'parenttype': 'DocType', 'role': 'Accounts User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': '', 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00660', 'parent': 'GL Mapper', 'read': 1, 'create': None, 'creation': '2010-02-10 13:50:27', 'modified': '2010-03-31 10:38:44', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'doc_type', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Doc Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Mapper', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00361', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-03-31 10:38:44', 'parenttype': 'DocType', 'fieldname': 'doc_type', 'fieldtype': 'Link', 'options': 'DocType', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Table', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'fields', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Fields', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Mapper', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00362', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-03-31 10:38:44', 'parenttype': 'DocType', 'fieldname': 'fields', 'fieldtype': 'Table', 'options': 'GL Mapper Detail', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/application_internal/doctype/gl_mapper_detail/gl_mapper_detail.txt b/application_internal/doctype/gl_mapper_detail/gl_mapper_detail.txt
deleted file mode 100644
index 929118a44b..0000000000
--- a/application_internal/doctype/gl_mapper_detail/gl_mapper_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-03-12 12:09:20', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 3, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': 'GLMDetail.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'nabin@webnotestech.com', 'document_type': None, 'name': 'GL Mapper Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'table_field', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Table Field', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Mapper Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00363', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-04-30 17:55:40', 'parenttype': 'DocType', 'fieldname': 'table_field', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'account', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Account', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Mapper Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00364', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-04-30 17:55:40', 'parenttype': 'DocType', 'fieldname': 'account', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'debit', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Debit', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Mapper Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00365', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-04-30 17:55:40', 'parenttype': 'DocType', 'fieldname': 'debit', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'credit', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Credit', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Mapper Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00366', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-04-30 17:55:40', 'parenttype': 'DocType', 'fieldname': 'credit', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'cost_center', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Cost Center', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Mapper Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00367', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-04-30 17:55:40', 'parenttype': 'DocType', 'fieldname': 'cost_center', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'against', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Against', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Mapper Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00368', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-04-30 17:55:40', 'parenttype': 'DocType', 'fieldname': 'against', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'remarks', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Remarks', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Mapper Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00369', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-04-30 17:55:40', 'parenttype': 'DocType', 'fieldname': 'remarks', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'voucher_type', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Voucher Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Mapper Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00370', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-04-30 17:55:40', 'parenttype': 'DocType', 'fieldname': 'voucher_type', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'voucher_no', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Voucher No', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Mapper Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00371', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-04-30 17:55:40', 'parenttype': 'DocType', 'fieldname': 'voucher_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'posting_date', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Posting Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'The date at which current entry will get or has actually executed.', 'parent': 'GL Mapper Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00372', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-04-30 17:55:40', 'parenttype': 'DocType', 'fieldname': 'posting_date', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'transaction_date', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Transaction Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'The date at which current entry is made in system.', 'parent': 'GL Mapper Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00373', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-04-30 17:55:40', 'parenttype': 'DocType', 'fieldname': 'transaction_date', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-30 17:55:40', 'doctype': 'DocField', 'oldfieldname': 'aging_date', 'owner': 'nabin@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Aging Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Mapper Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04931', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-04-30 17:55:40', 'parenttype': 'DocType', 'fieldname': 'aging_date', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'fiscal_year', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Fiscal Year', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Mapper Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL00374', 'idx': 13, 'default': None, 'colour': None, 'modified': '2010-04-30 17:55:40', 'parenttype': 'DocType', 'fieldname': 'fiscal_year', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'against_voucher', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Against Voucher', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Mapper Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00375', 'idx': 14, 'default': None, 'colour': None, 'modified': '2010-04-30 17:55:40', 'parenttype': 'DocType', 'fieldname': 'against_voucher', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'against_voucher_type', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Against Voucher Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Mapper Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00376', 'idx': 15, 'default': None, 'colour': None, 'modified': '2010-04-30 17:55:40', 'parenttype': 'DocType', 'fieldname': 'against_voucher_type', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:20', 'doctype': 'DocField', 'oldfieldname': 'company', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Company', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Mapper Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL00377', 'idx': 16, 'default': None, 'colour': None, 'modified': '2010-04-30 17:55:40', 'parenttype': 'DocType', 'fieldname': 'company', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-05-04 16:40:02', 'doctype': 'DocField', 'oldfieldname': 'is_opening', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Is Opening', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Mapper Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01966', 'idx': 17, 'default': None, 'colour': None, 'modified': '2010-04-30 17:55:40', 'parenttype': 'DocType', 'fieldname': 'is_opening', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-07-21 16:59:08', 'doctype': 'DocField', 'oldfieldname': 'is_advance', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Is Advance', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'GL Mapper Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02620', 'idx': 18, 'default': None, 'colour': None, 'modified': '2010-04-30 17:55:40', 'parenttype': 'DocType', 'fieldname': 'is_advance', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/application_internal/doctype/impact_analysis/impact_analysis.txt b/application_internal/doctype/impact_analysis/impact_analysis.txt
deleted file mode 100644
index 1640f0528f..0000000000
--- a/application_internal/doctype/impact_analysis/impact_analysis.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-11-09 16:04:30', 'search_fields': 'change_title', 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'nabin@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 13, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'IA/.####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Impact Analysis', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00510', 'parent': 'Impact Analysis', 'read': 1, 'create': 1, 'creation': '2009-11-09 16:22:32', 'modified': '2010-03-31 10:39:26', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'nabin@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00511', 'parent': 'Impact Analysis', 'read': 1, 'create': None, 'creation': '2009-11-09 16:22:32', 'modified': '2010-03-31 10:39:26', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'nabin@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2009-11-09 16:22:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'nabin@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Analysis', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Impact Analysis', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03314', 'idx': 1, 'default': None, 'colour': 'Light Blue:DEF', 'modified': '2010-03-31 10:39:26', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Column Break', 'creation': '2009-11-09 16:22:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'nabin@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': '', 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Impact Analysis', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03315', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-03-31 10:39:26', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-09 16:22:32', 'doctype': 'DocField', 'oldfieldname': 'change_title', 'owner': 'nabin@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Title', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Impact Analysis', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03311', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-03-31 10:39:26', 'parenttype': 'DocType', 'fieldname': 'change_title', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-11-09 16:22:32', 'doctype': 'DocField', 'oldfieldname': 'analysis_verified_by', 'owner': 'nabin@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Analysis Verified By', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Impact Analysis', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03312', 'idx': 4, 'default': '', 'colour': None, 'modified': '2010-03-31 10:39:26', 'parenttype': 'DocType', 'fieldname': 'analysis_verified_by', 'fieldtype': 'Select', 'options': 'link:Profile', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-11-09 16:22:32', 'doctype': 'DocField', 'oldfieldname': 'code_verified_by', 'owner': 'nabin@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Code Verified By', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Impact Analysis', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03313', 'idx': 5, 'default': '', 'colour': None, 'modified': '2010-03-31 10:39:26', 'parenttype': 'DocType', 'fieldname': 'code_verified_by', 'fieldtype': 'Select', 'options': 'link:Profile', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Column Break', 'creation': '2009-11-09 16:22:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'nabin@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': '', 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Impact Analysis', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03316', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-03-31 10:39:26', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-11-09 16:22:32', 'doctype': 'DocField', 'oldfieldname': 'related_doctype', 'owner': 'nabin@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Related DocType', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Impact Analysis', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03308', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-03-31 10:39:26', 'parenttype': 'DocType', 'fieldname': 'related_doctype', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2009-11-09 16:22:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'nabin@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Action', 'width': '', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Impact Analysis', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03317', 'idx': 8, 'default': None, 'colour': 'Light Blue:DEF', 'modified': '2010-03-31 10:39:26', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text Editor', 'creation': '2009-11-09 16:22:32', 'doctype': 'DocField', 'oldfieldname': 'changes_to_be_made', 'owner': 'nabin@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Changes To Be Made', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Impact Analysis', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03309', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-03-31 10:39:26', 'parenttype': 'DocType', 'fieldname': 'changes_to_be_made', 'fieldtype': 'Text Editor', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Code', 'creation': '2009-11-09 16:22:32', 'doctype': 'DocField', 'oldfieldname': 'effect_on_existing_account', 'owner': 'nabin@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Patching Procedure', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Impact Analysis', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03310', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-03-31 10:39:26', 'parenttype': 'DocType', 'fieldname': 'effect_on_existing_account', 'fieldtype': 'Code', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/application_internal/doctype/mail/mail.txt b/application_internal/doctype/mail/mail.txt
deleted file mode 100644
index 806c28c838..0000000000
--- a/application_internal/doctype/mail/mail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-06-04 10:23:48', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 5, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'Mail/.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': None, 'name': 'Mail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM01028', 'parent': 'Mail', 'read': 1, 'create': 1, 'creation': '2010-06-04 10:23:48', 'modified': '2010-08-08 15:04:31', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM01029', 'parent': 'Mail', 'read': 1, 'create': None, 'creation': '2010-06-04 10:23:48', 'modified': '2010-08-08 15:04:31', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'All', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-06-07 11:13:15', 'doctype': 'DocField', 'oldfieldname': 'to_user', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'To user', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Mail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05261', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-08-08 15:04:31', 'parenttype': 'DocType', 'fieldname': 'to_user', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-06-07 11:13:15', 'doctype': 'DocField', 'oldfieldname': 'from_user', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'From User', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Mail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05262', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-08-08 15:04:31', 'parenttype': 'DocType', 'fieldname': 'from_user', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-06-04 10:23:48', 'doctype': 'DocField', 'oldfieldname': 'is_main_thread', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Is Main Thread', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Mail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05228', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-08-08 15:04:31', 'parenttype': 'DocType', 'fieldname': 'is_main_thread', 'fieldtype': 'Select', 'options': '\nYes\nNo', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-06-04 10:23:48', 'doctype': 'DocField', 'oldfieldname': 'main_thread_id', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Main Thread Id', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Mail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05229', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-08-08 15:04:31', 'parenttype': 'DocType', 'fieldname': 'main_thread_id', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-06-04 10:23:48', 'doctype': 'DocField', 'oldfieldname': 'subject', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Subject', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Mail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05230', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-08-08 15:04:31', 'parenttype': 'DocType', 'fieldname': 'subject', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2010-06-04 10:23:48', 'doctype': 'DocField', 'oldfieldname': 'message', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Message', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Mail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05231', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-08-08 15:04:31', 'parenttype': 'DocType', 'fieldname': 'message', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-06-04 10:23:48', 'doctype': 'DocField', 'oldfieldname': 'message_date', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Message Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Mail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05232', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-08-08 15:04:31', 'parenttype': 'DocType', 'fieldname': 'message_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-06-04 10:23:48', 'doctype': 'DocField', 'oldfieldname': 'last_updated_by', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Last Updated By', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Mail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05233', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-08-08 15:04:31', 'parenttype': 'DocType', 'fieldname': 'last_updated_by', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-06-04 10:23:48', 'doctype': 'DocField', 'oldfieldname': 'last_updated_on', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Last Updated On', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Mail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05234', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-08-08 15:04:31', 'parenttype': 'DocType', 'fieldname': 'last_updated_on', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-06-04 10:23:48', 'doctype': 'DocField', 'oldfieldname': 'previous_updated_by', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Previous Updated By', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Mail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05235', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-08-08 15:04:31', 'parenttype': 'DocType', 'fieldname': 'previous_updated_by', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Table', 'creation': '2010-06-04 10:28:22', 'doctype': 'DocField', 'oldfieldname': 'mail_participant', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Mail Participant', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Mail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05239', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-08-08 15:04:31', 'parenttype': 'DocType', 'fieldname': 'mail_participant', 'fieldtype': 'Table', 'options': 'Mail Participant Details', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/application_internal/doctype/mail_participant_details/mail_participant_details.txt b/application_internal/doctype/mail_participant_details/mail_participant_details.txt
deleted file mode 100644
index b6a13b21f3..0000000000
--- a/application_internal/doctype/mail_participant_details/mail_participant_details.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-06-04 10:40:44', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 3, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': None, 'name': 'Mail Participant Details', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-06-04 10:40:44', 'doctype': 'DocField', 'oldfieldname': 'participant_name', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Participant Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Mail Participant Details', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05240', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-08-08 15:04:17', 'parenttype': 'DocType', 'fieldname': 'participant_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-06-04 10:40:44', 'doctype': 'DocField', 'oldfieldname': 'read_status', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Read Status', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Mail Participant Details', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05241', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-08-08 15:04:17', 'parenttype': 'DocType', 'fieldname': 'read_status', 'fieldtype': 'Select', 'options': '\nRead\nUnread', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-06-04 10:40:44', 'doctype': 'DocField', 'oldfieldname': 'delete_status', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Delete Status', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Mail Participant Details', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05242', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-08-08 15:04:17', 'parenttype': 'DocType', 'fieldname': 'delete_status', 'fieldtype': 'Select', 'options': '\nYes\nNo', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/application_internal/doctype/menu_control/menu_control.txt b/application_internal/doctype/menu_control/menu_control.txt
deleted file mode 100644
index 37f72682cb..0000000000
--- a/application_internal/doctype/menu_control/menu_control.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-06-12 12:08:31', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 55, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': '', 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Menu Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/application_internal/doctype/message/message.txt b/application_internal/doctype/message/message.txt
deleted file mode 100644
index 6a7d6ecfd3..0000000000
--- a/application_internal/doctype/message/message.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-13 13:47:58', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 1, 'read_only': 1, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 2, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'MSG.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': None, 'name': 'Message', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00770', 'parent': 'Message', 'read': 1, 'create': 1, 'creation': '2010-04-13 13:47:58', 'modified': '2010-08-08 15:03:43', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Customer', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00771', 'parent': 'Message', 'read': 1, 'create': 1, 'creation': '2010-04-13 13:47:58', 'modified': '2010-08-08 15:03:43', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'Supplier', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00772', 'parent': 'Message', 'read': 1, 'create': 1, 'creation': '2010-04-13 13:47:58', 'modified': '2010-08-08 15:03:43', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-13 13:47:58', 'doctype': 'DocField', 'oldfieldname': 'subject', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Subject', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Message', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04639', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-08-08 15:03:43', 'parenttype': 'DocType', 'fieldname': 'subject', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-13 13:47:58', 'doctype': 'DocField', 'oldfieldname': 'message_type', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Message Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Message', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04641', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-08-08 15:03:43', 'parenttype': 'DocType', 'fieldname': 'message_type', 'fieldtype': 'Select', 'options': 'Enquiry\nFeedback\nComplaint\nSuggestion', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2010-04-13 13:47:58', 'doctype': 'DocField', 'oldfieldname': 'details', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Message', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04640', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-08-08 15:03:43', 'parenttype': 'DocType', 'fieldname': 'details', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/application_internal/doctype/message_control/message_control.py b/application_internal/doctype/message_control/message_control.py
deleted file mode 100644
index 0903f16ea0..0000000000
--- a/application_internal/doctype/message_control/message_control.py
+++ /dev/null
@@ -1,307 +0,0 @@
-# Please edit this list and import only required elements
-import webnotes
-
-from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
-from webnotes.model import db_exists
-from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType
-from webnotes.model.doclist import getlist, copy_doclist
-from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
-from webnotes import session, form, is_testing, msgprint, errprint
-
-set = webnotes.conn.set
-sql = webnotes.conn.sql
-get_value = webnotes.conn.get_value
-in_transaction = webnotes.conn.in_transaction
-convert_to_lists = webnotes.conn.convert_to_lists
-	
-# -----------------------------------------------------------------------------------------
-
-
-class DocType:
-  def __init__(self,doc,doclist=[]):
-    self.doc = doc
-    self.doclist = doclist
-  
-  #get list of unread messages
-  #------------------------------------
-  def get_unread_msg_lst(self,arg):
-    ret = {}
-    ret['ur_lst'] = convert_to_lists(sql("select t1.name from `tabMail` t1, `tabMail Participant Details` t2 where t2.participant_name = '%s' and t2.parent = t1.name and (t2.read_status = 'No' or t2.read_status is NULL) and (t2.delete_status = 'No' or t2.delete_status is NULL) and t1.last_updated_by != t2.participant_name" % arg))
-    return ret
-  
-  # get list of email participants at the time of reply msg. This will give name of iwebnotes user and email id of non iwebnotes user if envolved in that email
-  #------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-  def get_thread_details(self,arg):
-    arg = eval(arg)
-    ret = {}
-    to_list3 = []
-    
-    ret['tl'] = convert_to_lists(sql("select t1.subject,t1.message, t1.owner, t1.message_date, t1.main_thread_id, t2.first_name, t2.file_list from `tabMail` t1, `tabProfile` t2 where t1.main_thread_id='%s' and t2.name=t1.owner" % arg['cur_msg_id']))
-    
-    to_user_list = sql("select participant_name from `tabMail Participant Details` where participant_name != '%s' and parent = '%s'" % (arg['user_name'], arg['cur_msg_id']))
-    to_list1 = [x[0] for x in to_user_list]
-    
-    non_member_dict = self.get_non_member_list(to_list1)
-    non_member_list = non_member_dict['non_erp_user']
-    
-    for m in to_list1:
-      if m not in non_member_list:
-        to_list2 = sql("select first_name from `tabProfile` where name = '%s'" % (m))
-        to_list3.append(to_list2[0][0])
-    
-    for y in non_member_list:
-      to_list3.append(y)
-    
-    ret['to_list'] = to_list3    
-    return ret
-  
-  #validate message
-  #---------------------
-  def validate_message(self, msg, to_list = []):
-    ml = ['subject','message']
-    for m in ml:
-      if not msg.fields.get(m):
-        msgprint("error:To, Subject and Message are required. Please try again.")
-        raise Exception
-  
-  #get list of emails which are not registered on that iwebnotes account
-  #----------------------------------------------------------------------------------
-  def get_non_member_list(self, arg):
-    to_list, ret, new_list, non_valid_lst, non_valid_lst_msg= arg, {}, [], [], ''
-    
-    for m in to_list:
-      check_user = sql("select name from `tabProfile` where name = '%s'" % m)
-      check_user = check_user and check_user[0][0] or 'not_user'
-      
-      if check_user == 'not_user':
-        if not validate_email_add(m):
-          non_valid_lst.append(m)
-        else:
-          new_list.append(m)
-    
-    if non_valid_lst:
-      for x in non_valid_lst:
-        if non_valid_lst_msg == '' :
-          non_valid_lst_msg = x
-        else :
-          non_valid_lst_msg = non_valid_lst_msg + ', ' + x
-      msgprint("error:Incorrect email id format. Message can not be sent to following mentioned email-id(s)." + "\n" + "\n" + non_valid_lst_msg)
-    
-    ret['non_erp_user'] = new_list
-    ret['non_valid_lst'] = non_valid_lst
-    return ret
-  
-  #create message thread
-  #----------------------------------
-  def create_msg_thread(self, arg, to_list, new_msg):
-    arg = eval(arg)
-    msg_fld = {'message_date':nowdate(), 'owner':arg['user_name'], 'subject':arg['subject'], 'message':arg['message'], 'last_updated_on':nowdate(), 'last_updated_by':arg['user_name'], 'is_main_thread':new_msg and 'Yes' or 'No', 'to_user':new_msg and cstr(to_list) or '', 'from_user': new_msg and arg['user_name'] or '', 'previous_updated_by': new_msg and arg['user_name'] or ''}
-    
-    msg = Document('Mail')
-    for f in msg_fld:
-      msg.fields[f]=msg_fld[f]
-    if new_msg:
-      self.validate_message(msg, to_list)
-    if not new_msg:
-      msg.main_thread_id = arg['message_id']
-    msg.save(new=1)
-    return msg.name
-  
-  #add mail participants
-  #---------------------------
-  def add_mail_participants(self, participant, msg_id):
-    fields = {'participant_name': participant, 'parent':msg_id, 'parenttype':'Mail', 'parentfield':'mail_participant'}
-    child = Document('Mail Participant Details')
-    for f in fields:
-      child.fields[f]=fields[f]
-    child.save(new=1)
-  
-  #send email notification to personal id
-  #-----------------------------------------------
-  def email_to_personal_id(self, email_arg, non_member_list):
-    message_subject =''
-    if email_arg['participant'] not in non_member_list:
-      r_full_nm = sql("select first_name from`tabProfile` where name = '%s'" % email_arg['participant'])
-      r_full_nm = r_full_nm and r_full_nm[0][0] or ''
-    
-    if not(email_arg['participant'] == email_arg['sender']):
-      if email_arg['participant'] not in non_member_list:
-        self.notification_email_to_members(email_arg['participant'],r_full_nm,email_arg['sender'],email_arg['sender_nm'])
-      else :
-        message_subject = 'Message from ' + cstr(email_arg['sender_nm']) + '- '
-        if email_arg['new_msg']:
-          message_subject=message_subject+ cstr(email_arg['mail_sub'])
-        else:
-          message_subject=message_subject+ 'Re: '+cstr(email_arg['mail_sub'])
-        self.notification_email_to_non_members(email_arg['participant'], email_arg['sender'], email_arg['sender_nm'], message_subject, email_arg['mail_msg'])
-  
-  #send new message
-  #----------------------------
-  def send_message(self,arg1):
-    arg = eval(arg1)
-    val, to_list1 = 'false', arg['to_list'].split(',')
-    new_list = [l.strip() for l in to_list1 if l.strip()]
-    
-    non_member_dict = self.get_non_member_list(new_list)
-    non_member_list = non_member_dict['non_erp_user']
-    non_valid_lst = non_member_dict['non_valid_lst']
-    
-    if len(new_list) > len(non_valid_lst) :
-      to_list = [m for m in new_list if m not in non_valid_lst]
-      to_list.append(arg['user_name'])
-      msg_id = self.create_msg_thread(arg1, to_list, 1)
-      sql("update `tabMail` set main_thread_id = '%s' where name = '%s'" % (msg_id, msg_id))
-      
-      s_full_nm = sql("select first_name from`tabProfile` where name = '%s'" % arg['user_name'])
-      s_full_nm = s_full_nm and s_full_nm[0][0] or ''
-      
-      for t in to_list:
-        self.add_mail_participants(t,msg_id)
-        val = 'true'
-        
-        # email notification to personal email id
-        email_arg = {'participant':t, 'sender':arg['user_name'], 'sender_nm':s_full_nm, 'mail_sub':arg['subject'], 'mail_msg':arg['message'], 'new_msg':1}
-        self.email_to_personal_id(email_arg, non_member_list) 
-      return cstr(val)
-    else :
-      msgprint("error:Please mention preper email-ids. Message can not be sent.");
-  
-  #update main msg thread
-  #---------------------------------
-  def update_main_thread_msg(self, arg):
-    thread_msg = Document('Mail',arg['message_id'])
-    thread_msg.last_updated_on = nowdate()
-    if thread_msg.last_updated_by != session['user']:
-      thread_msg.previous_updated_by = thread_msg.last_updated_by
-    thread_msg.last_updated_by = arg['user_name']
-    thread_msg.save()
-  
-  #send reply msg
-  #---------------------
-  def send_reply(self,arg1):
-    arg = eval(arg1)
-    val = 'false'
-    
-    if not arg['message']:
-      msgprint("Please type some message")
-      raise Exception
-    
-    msg_id = self.create_msg_thread(arg1, '', 0)
-    self.update_main_thread_msg(arg)
-    
-    nm = sql("select name from `tabMail` where main_thread_id = '%s' and is_main_thread = 'Yes'" % arg['message_id'])
-    msg_nm = nm and nm[0][0] or ''
-    sql("update `tabMail Participant Details` set delete_status = 'No' where parent='%s'" % (msg_nm))
-    sql("update `tabMail Participant Details` set read_status = 'No' where parent='%s' and participant_name != '%s'" % (msg_nm, session['user']))
-    val = 'true'
-    
-    p_nm = sql("select participant_name from `tabMail Participant Details` where parent='%s' and participant_name!='%s'"%(msg_nm, session['user']))
-    if p_nm:
-      p_nm_lst = [x[0] for x in p_nm]
-      
-      non_member_dict = self.get_non_member_list(p_nm_lst)
-      non_member_list = non_member_dict['non_erp_user']
-      
-      s_full_nm = sql("select first_name from`tabProfile` where name = '%s'" % arg['user_name'])
-      s_full_nm = s_full_nm and s_full_nm[0][0] or ''
-      
-      for m in p_nm_lst:
-        # email notification to personal email id
-        email_arg = {'participant':m, 'sender':arg['user_name'], 'sender_nm':s_full_nm, 'mail_sub':arg['subject'], 'mail_msg':arg['message'], 'new_msg':0}
-        self.email_to_personal_id(email_arg, non_member_list)    
-    return cstr(val)
-  
-  #delete message
-  #----------------------
-  def delete_message(self, arg):
-    m_arg = arg.split('~~')
-    user_nm = m_arg[0]
-    msg_lst = m_arg[1].split(',')
-    msg_del = 'false'
-    for i in msg_lst:
-      sql("update `tabMail Participant Details` set delete_status = 'Yes' where parent='%s' and participant_name = '%s'" % (i, user_nm))
-      msg_del = 'true'
-    return cstr(msg_del)
-  
-  # set read or unread status of message
-  #---------------------------------------------
-  def read_unread_message(self,arg):
-    arg = eval(arg);
-    sql("update `tabMail Participant Details` set read_status = '%s' where parent='%s' and participant_name = '%s'" % (arg['read'],arg['msg'], arg['user']))
-  
-  # function for checking message is already read or not
-  #--------------------------------------------------------------
-  def check_read(self,arg):
-    arg = eval(arg);
-    chk_val=sql("select read_status from `tabMail Participant Details` where parent='%s' and participant_name = '%s'" % (arg['msg'], arg['user']))[0][0] or ''
-    if chk_val == '':
-      chk_val = 'blank'
-    
-    return cstr(chk_val)
-  
-  #list of autosuggested users for 'to list'
-  #-----------------------------------------------
-  def get_to_list(self, arg):
-    li = sql("select name, first_name from `tabProfile` where first_name like '%s%%' and name!='%s' and name!='Guest' limit 10" % (arg.strip(), session['user']))
-    li = [{'id':l[0], 'value':l[0], 'info':l[1]} for l in li]
-    return {'results':li}    
-  
-  # unread message count
-  #--------------------------
-  def get_unread_msg_count(self, arg):
-    ret = convert_to_lists(sql("select count(t1.name) from `tabMail` t1, `tabMail Participant Details` t2 where t2.participant_name = '%s' and t2.parent = t1.name and (t2.read_status = 'No' or t2.read_status is NULL) and (t2.delete_status = 'No' or t2.delete_status is NULL) and t1.last_updated_by != t2.participant_name" % arg))
-    
-    if ret:
-      return cstr(ret[0][0])
-    else:
-      return cstr(0)
-  
-  # email notification to personal email id of registered users
-  #--------------------------------------------------------------------
-  def notification_email_to_members(self, receiver_id, r_full_nm, sender_id, s_full_nm):
-    msg = """
-
-
-
-Dear %s,

    
-You have received a new message from %s.

-
-To check the message, visit Inbox of erpnext.


-Stay connected using the link:


-
 https://www.erpnext.com



- 
-Thank You,


-Administrator

-erpnext
-
-
-    """ % (r_full_nm, s_full_nm)
-
-    # send email
-    sendmail([receiver_id], sender = sender_id, msg=msg, subject='ERP - You have received a new message')
-  
-  # email to non ERP member's personal id
-  #-------------------------------------------------------
-  def notification_email_to_non_members(self, receiver_id, sender_id, s_full_nm, message_subject, message):
-    msg = """
-
-
-
-Hi,


-You have received a new message from %s via erpnext.


-Message:

-%s


-
-Not on erpnext? Sign up now! 

-Stay connected using the link:


-
 https://www.erpnext.com



-
-Thank You,


-Administrator

-erpnext
-
-
-    """ % (s_full_nm, message)
-
-    # send email
-    sendmail([receiver_id], sender = sender_id, msg=msg, subject=message_subject)
\ No newline at end of file
diff --git a/application_internal/doctype/message_control/message_control.txt b/application_internal/doctype/message_control/message_control.txt
deleted file mode 100644
index c88731eda2..0000000000
--- a/application_internal/doctype/message_control/message_control.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-06-07 11:26:34', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 17, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': '', 'name': 'Message Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-10-04 14:20:37', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/application_internal/doctype/module_setter/module_setter.py b/application_internal/doctype/module_setter/module_setter.py
deleted file mode 100644
index 3bfc264b93..0000000000
--- a/application_internal/doctype/module_setter/module_setter.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Please edit this list and import only required elements
-import webnotes
-
-from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
-from webnotes.model import db_exists
-from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType
-from webnotes.model.doclist import getlist, copy_doclist
-from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
-from webnotes import session, form, is_testing, msgprint, errprint
-
-set = webnotes.conn.set
-sql = webnotes.conn.sql
-get_value = webnotes.conn.get_value
-in_transaction = webnotes.conn.in_transaction
-convert_to_lists = webnotes.conn.convert_to_lists
-	
-# -----------------------------------------------------------------------------------------
-
-
-class DocType:
-  def __init__(self, d,dl):
-    self.doc, self.doclist = d,dl
-
-  def set_module(self):
-    sql("update tabDocType set module=%s where name=%s", (self.doc.module, self.doc.doc_type))
\ No newline at end of file
diff --git a/application_internal/doctype/module_setter/module_setter.txt b/application_internal/doctype/module_setter/module_setter.txt
deleted file mode 100644
index e570e2d70e..0000000000
--- a/application_internal/doctype/module_setter/module_setter.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-12 12:36:55', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 4, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Module Setter', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00143', 'parent': 'Module Setter', 'read': 1, 'create': 1, 'creation': '2009-03-12 12:36:55', 'modified': '2010-03-31 10:42:15', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 12:36:55', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Doc Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Module Setter', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01328', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-03-31 10:42:15', 'parenttype': 'DocType', 'fieldname': 'doc_type', 'fieldtype': 'Select', 'options': 'link:DocType', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 12:36:55', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Module', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Module Setter', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01329', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-03-31 10:42:15', 'parenttype': 'DocType', 'fieldname': 'module', 'fieldtype': 'Select', 'options': 'link:Module Def', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 12:36:55', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Set', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Module Setter', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01330', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-03-31 10:42:15', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'set_module', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/application_internal/doctype/module_tip_control/module_tip_control.py b/application_internal/doctype/module_tip_control/module_tip_control.py
deleted file mode 100644
index 9b97ad57e1..0000000000
--- a/application_internal/doctype/module_tip_control/module_tip_control.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Please edit this list and import only required elements
-import webnotes
-
-from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
-from webnotes.model import db_exists
-from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType
-from webnotes.model.doclist import getlist, copy_doclist
-from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
-from webnotes import session, form, is_testing, msgprint, errprint
-
-set = webnotes.conn.set
-sql = webnotes.conn.sql
-get_value = webnotes.conn.get_value
-in_transaction = webnotes.conn.in_transaction
-convert_to_lists = webnotes.conn.convert_to_lists
-	
-# -----------------------------------------------------------------------------------------
-
-
-class DocType:
-  def __init__(self, d, dl):
-    self.doc, self.doclist = d, dl
-
-  # get update on recent activities of module
-  # -----------------------------------------
-  def get_module_activity(self, args):
-    args = eval(args)
-    ret = {}
-    for tr in args['tr_list']:
-      cnt = sql("select ifnull(count(name),0) from `tab%s` where datediff(now(),creation) between 0 and 7"%(tr))
-      if cnt[0][0]:
-        ret[tr] = cnt
-    if ret:        
-      return ret
\ No newline at end of file
diff --git a/application_internal/doctype/module_tip_control/module_tip_control.txt b/application_internal/doctype/module_tip_control/module_tip_control.txt
deleted file mode 100644
index ee5681986b..0000000000
--- a/application_internal/doctype/module_tip_control/module_tip_control.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-05-10 12:54:12', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 30, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': '', 'name': 'Module Tip Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-11-08 11:50:50', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/application_internal/doctype/multiple_transfer/multiple_transfer.js b/application_internal/doctype/multiple_transfer/multiple_transfer.js
deleted file mode 100644
index d12bfa4a59..0000000000
--- a/application_internal/doctype/multiple_transfer/multiple_transfer.js
+++ /dev/null
@@ -1,158 +0,0 @@
-cur_frm.cscript.is_list = function(d) { return d.modules_or_list=='List' ? 1 : 0 }
-cur_frm.cscript.is_modules = function(d) { return d.modules_or_list=='Modules' ? 1 : 0 }
-
-cur_frm.cscript['Do Transfer'] = function(doc) {
-  al = getchildren('Transfer Account', doc.name, 'transfer_accounts');
-  ml = getchildren('Transfer Module', doc.name, 'transfer_modules');
-  sl = doc.selected_list.split(NEWLINE)
-  
-  cur_frm.cscript.cancel_transfer = 0;
-
-  cur_frm.cscript.do_list = [];
-
-  // for each account
-  for(var ai = 0; ai < al.length; ai++) {
-
-
-    // if transfer
-    if(cint(al[ai].transfer)) {
-
-      // module
-      // ------
-      if(doc.modules_or_list == 'Modules') {
-      
-        for(var mi = 0; mi < ml.length; mi++) {
-        
-          if(ml[mi].transfer) {
-            var args = {server:al[ai].server, path:al[ai].path, pwd:al[ai].admin_password, act: al[ai].account, module:ml[mi].module, transfer_what:doc.transfer_what}
-            cur_frm.cscript.do_list.push(args);
-          }
-        }
-      }
-
-      // list
-      // ------
-      if(doc.modules_or_list == 'List') {
-      
-        for(var si = 0; si < sl.length; si++) {
-          if(sl[si]){
-          var s = sl[si].split(',');        
-          var args = {server:al[ai].server, path:al[ai].path, pwd:al[ai].admin_password, act: al[ai].account, dt: strip(s[0]), dn:strip(s[1]), transfer_what:doc.transfer_what}
-          cur_frm.cscript.do_list.push(args);}
-        }
-      }
-    }
-
-  }
-  
-  locals[doc.doctype][doc.name].transfer_log = 'Transferring...'.bold();
-  refresh_field('transfer_log');
-    
-  if(cur_frm.cscript.do_list.length)
-  	cur_frm.cscript.do_next();
-
-}
-
-cur_frm.cscript.do_next = function() {
-
-  if(cur_frm.cscript.do_list.length){
-    var t = cur_frm.cscript.do_list[0];
-
-    // do transfer
-
-    locals[doc.doctype][doc.name].transfer_log += '
Transferring... Account:' + t.act + ':' + t.module + ', Record:'+t.dt + ',' + t.dn;
-    refresh_field('transfer_log');
-
-    $c_obj(make_doclist(doc.doctype, doc.name), 'do_transfer', docstring(t), cur_frm.cscript.ret_fn);
-
-    
-    // remove from list
-    var tmp = [];
-    for(var i=1;i'.join(msg)
-    
-  def transfer(self, dt, dn):
-    tl = getdoc(dt, dn)
-    # clean up
-    no_export_fields = ('creation','modified_by','owner','server_code_compiled','recent_documents','oldfieldtype','oldfieldname','superclass','ss_colourkey','has_monitors','onupdate','permtype','no_copy', 'print_hide','transaction_safe','setup_test')
-
-    for d in tl:
-      for f in no_export_fields:
-        if d.fields.has_key(f): del d.fields[f]
-
-    return [d.fields for d in tl]
-
-
-  # run remote script
-  # ----------------------------------------
-  
-  def execute_remote_code(self, arg):
-    msg = []
-    arg = eval(arg)
-    remote_server = FrameworkServer(arg.get('server'),arg.get('path'),"Administrator",arg.get('pwd'),arg.get('act', ''))
-    ret = remote_server.runserverobj('Control Panel','Control Panel','execute_test',self.doc.remote_code)
-    if ret.get('exc'):
-      msg.append(ret['exc'])
-    else:
-      if ret.get('server_messages'):  # this returns msg in msgprints from remote account
-        msgprint(arg.get('act')+':')
-        msgprint(ret['server_messages'])
-      msg.append(arg.get('act')+" updated")
-    return '
'.join(msg)
\ No newline at end of file
diff --git a/application_internal/doctype/multiple_transfer/multiple_transfer.txt b/application_internal/doctype/multiple_transfer/multiple_transfer.txt
deleted file mode 100644
index 2c5cbd75e0..0000000000
--- a/application_internal/doctype/multiple_transfer/multiple_transfer.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-04-29 15:06:28', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 392, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': None, 'name': 'Multiple Transfer', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00284', 'parent': 'Multiple Transfer', 'read': 1, 'create': 1, 'creation': '2009-04-29 15:06:28', 'modified': '2010-08-08 14:50:02', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00285', 'parent': 'Multiple Transfer', 'read': 1, 'create': None, 'creation': '2009-04-29 16:46:42', 'modified': '2010-08-08 14:50:02', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-04-29 15:06:28', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Accounts', 'width': '62%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01943', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-07-22 10:52:14', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Application Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05676', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': 'application_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-07-22 10:52:14', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Get App Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05677', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'get_app_details', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-04-29 15:06:28', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Transfer Accounts', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01944', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': 'transfer_accounts', 'fieldtype': 'Table', 'options': 'Transfer Account', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-04-29 15:06:28', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Transfer List', 'width': '38%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01945', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-04-29 16:29:42', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Modules or List', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01950', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': 'modules_or_list', 'fieldtype': 'Select', 'options': 'Modules\nList', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-04-29 16:29:42', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Transfer List', 'width': None, 'trigger': '', 'depends_on': 'fn:is_list', 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'List individual items to transfer in the format DocType, name, each on a new line.
\nExample: DocType, Sales Order', 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01951', 'idx': 7, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': 'selected_list', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-04-29 15:06:28', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Transfer Modules', 'width': None, 'trigger': '', 'depends_on': 'fn:is_modules', 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01946', 'idx': 8, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': 'transfer_modules', 'fieldtype': 'Table', 'options': 'Transfer Module', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-04-29 15:06:28', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01947', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-04-29 15:06:28', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Transfer What', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01948', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': 'transfer_what', 'fieldtype': 'Select', 'options': '\nDocTypes\nEverything', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-07-23 13:27:03', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Transfer To', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05680', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': 'transfer_to', 'fieldtype': 'Select', 'options': 'Selected Accounts\nAll Accounts', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-04-29 15:06:28', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Do Transfer', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01949', 'idx': 12, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-04-29 16:46:42', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Transfer Log', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01952', 'idx': 13, 'default': None, 'colour': None, 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': 'transfer_log', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-05-11 16:12:19', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Cancel Transfer', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02023', 'idx': 14, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-07-08 14:25:40', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Remote Script', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02554', 'idx': 15, 'default': None, 'colour': None, 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': 'Simple', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-07-08 14:25:40', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Remote Code', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02555', 'idx': 16, 'default': None, 'colour': None, 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': 'remote_code', 'fieldtype': 'Code', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-07-08 17:59:46', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02561', 'idx': 17, 'default': None, 'colour': None, 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': 'Simple', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-07-08 17:54:04', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': '', 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02558', 'idx': 18, 'default': None, 'colour': None, 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-07-08 14:25:40', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Update Accounts', 'width': '', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'HANDLE WITH CARE !!!!!', 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02556', 'idx': 19, 'default': None, 'colour': None, 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Button', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-07-08 17:54:04', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': '', 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02559', 'idx': 20, 'default': None, 'colour': None, 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-07-08 17:54:04', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Cancel Updates', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'OOOOPS !!!!! MISTAKE !!!!!!!!! SORRY !!!!!!', 'parent': 'Multiple Transfer', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02560', 'idx': 21, 'default': None, 'colour': None, 'modified': '2010-08-08 14:50:02', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/application_internal/doctype/password_control/password_control.py b/application_internal/doctype/password_control/password_control.py
deleted file mode 100644
index fbe95f1e1e..0000000000
--- a/application_internal/doctype/password_control/password_control.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# Please edit this list and import only required elements
-import webnotes
-
-from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
-from webnotes.model import db_exists
-from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType
-from webnotes.model.doclist import getlist, copy_doclist
-from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
-from webnotes import session, form, is_testing, msgprint, errprint
-
-set = webnotes.conn.set
-sql = webnotes.conn.sql
-get_value = webnotes.conn.get_value
-in_transaction = webnotes.conn.in_transaction
-convert_to_lists = webnotes.conn.convert_to_lists
-	
-# -----------------------------------------------------------------------------------------
-
-
-class DocType:
-  def __init__(self, doc, doclist):
-    self.doc = doc
-    self.doclist = doclist
-  
-  def get_date_diff(self):
-    if session['user'] != 'Administrator' and session['user'] != 'Demo':
-      last_pwd_date = sql("select password_last_updated from tabProfile where name=%s",session['user'])[0][0] or ''
-      if cstr(last_pwd_date) == '':
-        sql("update tabProfile set password_last_updated = '%s' where name='%s'"% (nowdate(),session['user']))
-      else:
-        date_diff = (getdate(nowdate()) -last_pwd_date).days
-        return date_diff
-        
-  def get_cur_pwd(self):
-    if session['user'] != 'Administrator' and session['user'] != 'Demo':
-      cur_pwd = sql("select password from tabProfile where name=%s",session['user'])[0][0] or ''
-      return cur_pwd
-      
-  def reset_password(self,pwd):
-    sql("update tabProfile set password= '%s',password_last_updated='%s' where name = '%s'" % (pwd,nowdate(),session['user']))
\ No newline at end of file
diff --git a/application_internal/doctype/password_control/password_control.txt b/application_internal/doctype/password_control/password_control.txt
deleted file mode 100644
index c2d5632b49..0000000000
--- a/application_internal/doctype/password_control/password_control.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-05-25 17:17:29', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 7, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Password Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/application_internal/doctype/patch_util/patch_util.txt b/application_internal/doctype/patch_util/patch_util.txt
deleted file mode 100644
index 261b1ea479..0000000000
--- a/application_internal/doctype/patch_util/patch_util.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-12-15 09:56:48', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 6, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': '', 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': '', 'name': 'Patch Util', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-12-24 13:28:08', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/application_internal/doctype/payroll_tips_common/payroll_tips_common.js b/application_internal/doctype/payroll_tips_common/payroll_tips_common.js
deleted file mode 100644
index af393dddc5..0000000000
--- a/application_internal/doctype/payroll_tips_common/payroll_tips_common.js
+++ /dev/null
@@ -1,78 +0,0 @@
-// Global dictionary of next steps for doctypes
-// ============================================
-pscript.payroll_tip_dict = {'Employee':['Payroll Rule', 'Salary Structure'], 'Salary Structure':['IT Checklist', 'Salary Slip']};
-
-// Set tips depending on conditions
-// ================================
-cur_frm.cscript.get_tips = function(doc, cdt, cdn)
-{
-  
-  var next_step_list = pscript.payroll_tip_dict[cur_frm.doctype];
-  
-  // from is shown in print format
-  if(!cur_frm.editable){
-    cur_frm.set_tip("Click on the 
Edit
 button above to edit this " + cur_frm.doctype + ".");
-  }
-  
-  // form is not in print format
-  if(cur_frm.editable){
-    // new doc
-    if(doc.__islocal){
-      if(doc.status=='Cancelled' || doc.amended_from)
-        cur_frm.set_tip("You can now make changes in this " + cur_frm.doctype + " and save it by clicking on the 
Save
 button in the above toolbar.");
-      
-      // doc is completely new
-      else{
-        // For Salary Slip
-        if(cur_frm.doctype=='Salary Slip'){
-          cur_frm.set_tip("To create " + cur_frm.doctype + " please enter all the details and save it by clicking on the 
Save
 button in the above toolbar.");
-          cur_frm.append_tip("To calculate earnings and deductions click on 
Process Payroll
 button after saving the form");
-        }
-        // For IT Checklist
-        else if(cur_frm.doctype=='IT Checklist'){
-          cur_frm.set_tip("To create " + cur_frm.doctype + " please enter all the details and click on 
Done
 button below to fetch all the details in the remaining tabs.");
-          cur_frm.append_tip("To calculate taxes, please enter the actual amount in all the tables in the remaining tabs and click on 
Calculate
 button in the 
Total Taxable Income
 tab.");
-        }
-        // For Others
-        else
-          cur_frm.set_tip("To create " + cur_frm.doctype + " please start by entering all the mandatory fields(marked 
 Red
).

 You can then save this form by clicking on the 
Save
 button in the above toolbar.");
-      }  
-    }
-    
-    // doc exists
-    else if(!doc.__islocal){
-      // execute when doc is saved
-      if(doc.docstatus==0 && cur_frm.doctype=='Salary Slip'){
-        cur_frm.set_tip("You have saved your " + cur_frm.doctype + ". To calculate earnings and deductions click on 
Process Payroll
 button below.");
-        cur_frm.append_tip("You can make this draft permanent by clicking on 
Submit
 button above.")
-      }
-      
-      // execute if doc is submitted
-      else if(doc.docstatus==1 && cur_frm.doctype=='Salary Slip'){
-        cur_frm.set_tip("You have submitted this " + cur_frm.doctype + ".");
-        cur_frm.append_tip("(To make changes in this "+ cur_frm.doctype + " click on the 
Cancel
 button above.)");
-      }
-     
-      // execute if doc has only save permission
-      else if(doc.docstatus==0 && (cur_frm.doctype=='IT Checklist' || cur_frm.doctype=='Salary Structure' || cur_frm.doctype=='Employee')){
-        cur_frm.set_tip("You have saved this " + cur_frm.doctype + ".");
-               
-        for(var i=0; iAmend button above.");
-      }
-    }
-  }
-}
-
-// Executes when doc is edit status of doc is changed
-// ==================================================
-cur_frm.cscript.edit_status_changed = function(doc, cdt, cdn){
-  cur_frm.cscript.get_tips();
-}
\ No newline at end of file
diff --git a/application_internal/doctype/payroll_tips_common/payroll_tips_common.txt b/application_internal/doctype/payroll_tips_common/payroll_tips_common.txt
deleted file mode 100644
index 13a8725b88..0000000000
--- a/application_internal/doctype/payroll_tips_common/payroll_tips_common.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-05-28 14:31:18', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 9, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': '', 'name': 'Payroll Tips Common', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-11-03 10:13:58', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/application_internal/doctype/production_tips_common/production_tips_common.txt b/application_internal/doctype/production_tips_common/production_tips_common.txt
deleted file mode 100644
index cb9db2ca0a..0000000000
--- a/application_internal/doctype/production_tips_common/production_tips_common.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-05-31 11:03:13', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 37, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Production Tips Common', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/application_internal/doctype/profile_control/profile_control.txt b/application_internal/doctype/profile_control/profile_control.txt
deleted file mode 100644
index 9a3e409540..0000000000
--- a/application_internal/doctype/profile_control/profile_control.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-	{
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2009-05-29 12:19:21',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': 1,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2010-11-03 11:03:11',
-		'modified_by': 'Administrator',
-		'module': 'Application Internal',
-		'name': 'Profile Control',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': '
',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 12
-	}
-]
\ No newline at end of file
diff --git a/application_internal/doctype/report_field_detail/report_field_detail.txt b/application_internal/doctype/report_field_detail/report_field_detail.txt
deleted file mode 100644
index 8eb40a181c..0000000000
--- a/application_internal/doctype/report_field_detail/report_field_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-05-29 15:22:09', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 9, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'FDD/.########', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Report Field Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-05-29 15:22:09', 'doctype': 'DocField', 'oldfieldname': 'field_label_fd', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Field Label', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Report Field Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02245', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-03-31 10:11:45', 'parenttype': 'DocType', 'fieldname': 'field_label_fd', 'fieldtype': 'Link', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-05-29 15:22:09', 'doctype': 'DocField', 'oldfieldname': 'field_type_fd', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Field Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Report Field Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02246', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-03-31 10:11:45', 'parenttype': 'DocType', 'fieldname': 'field_type_fd', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-05-29 15:22:09', 'doctype': 'DocField', 'oldfieldname': 'options_fd', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Options', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Report Field Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02247', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-03-31 10:11:45', 'parenttype': 'DocType', 'fieldname': 'options_fd', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-05-29 15:22:09', 'doctype': 'DocField', 'oldfieldname': 'table_name_fd', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Table Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Report Field Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02248', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-03-31 10:11:45', 'parenttype': 'DocType', 'fieldname': 'table_name_fd', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-05-29 15:22:09', 'doctype': 'DocField', 'oldfieldname': 'field_name_fd', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Field Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Report Field Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02249', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-03-31 10:11:45', 'parenttype': 'DocType', 'fieldname': 'field_name_fd', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-05-29 15:22:09', 'doctype': 'DocField', 'oldfieldname': 'field_width_fd', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Field Width', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Report Field Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02250', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-03-31 10:11:45', 'parenttype': 'DocType', 'fieldname': 'field_width_fd', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/application_internal/doctype/report_filter_detail/report_filter_detail.txt b/application_internal/doctype/report_filter_detail/report_filter_detail.txt
deleted file mode 100644
index 5732d3dcc0..0000000000
--- a/application_internal/doctype/report_filter_detail/report_filter_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-05-29 15:19:57', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 8, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'FRD/.########', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Report Filter Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-05-29 15:19:57', 'doctype': 'DocField', 'oldfieldname': 'field_label_fr', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Field Label', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Report Filter Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02240', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-03-31 10:12:06', 'parenttype': 'DocType', 'fieldname': 'field_label_fr', 'fieldtype': 'Link', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-05-29 15:19:57', 'doctype': 'DocField', 'oldfieldname': 'field_type_fr', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Field Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Report Filter Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02241', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-03-31 10:12:06', 'parenttype': 'DocType', 'fieldname': 'field_type_fr', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-05-29 15:19:57', 'doctype': 'DocField', 'oldfieldname': 'options_fr', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Options', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Report Filter Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02242', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-03-31 10:12:06', 'parenttype': 'DocType', 'fieldname': 'options_fr', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-05-29 15:19:57', 'doctype': 'DocField', 'oldfieldname': 'table_name_fr', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Table Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Report Filter Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02243', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-03-31 10:12:06', 'parenttype': 'DocType', 'fieldname': 'table_name_fr', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-05-29 15:19:57', 'doctype': 'DocField', 'oldfieldname': 'field_name_fr', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Field Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Report Filter Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02244', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-03-31 10:12:06', 'parenttype': 'DocType', 'fieldname': 'field_name_fr', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/application_internal/doctype/sso_control/sso_control.txt b/application_internal/doctype/sso_control/sso_control.txt
deleted file mode 100644
index 79c1bf40cf..0000000000
--- a/application_internal/doctype/sso_control/sso_control.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-07 12:13:03', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 4, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'SSO Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/application_internal/doctype/tips_common/tips_common.js b/application_internal/doctype/tips_common/tips_common.js
deleted file mode 100644
index bf9956c6b4..0000000000
--- a/application_internal/doctype/tips_common/tips_common.js
+++ /dev/null
@@ -1,87 +0,0 @@
-// Global dictionary of next steps for doctypes
-// ============================================
-pscript.tip_doc_dict = {'Quotation':['Sales Order'], 'Sales Order':['Delivery Note', 'Sales Invoice'], 'Delivery Note':['Sales Invoice'], 'Receivable Voucher':['Bank Voucher'], 'Indent':['Purchase Order'], 'Purchase Order':['Purchase Invoice'], 'Payable Voucher':['Bank Voucher'], 'Purchase Receipt':['Purchase Invoice'], 'Enquiry':['Quotation'], 'Lead':['Enquiry', 'Customer']};
-
-pscript.master_doctype_lst =['Authorization Rule','Bank','Batch','Branch','Brand','Business Letter','Business Letter Template','Business Letter Type','Campaign','City','Company','Contact','Cost Center','Country','Customer','Customer Group','Deduction Type','Department','Designation','Earning Type','Employee','Employment Type','Expense Type','File Group','Fiscal Year','Grade','Holiday List','Industry Type','Item','Item Group','KRA Template','Landed Cost Master','Lead','Leave Type', 'Manage Account', 'Mode of Payment','Order Lost Reason','Other Charges','Period','Price List','Print Heading','Project','Purchase Other Charges','Purpose of Service','Sales BOM','Sales Partner','Sales Person','Serial No','State','Supplier','Supplier Type','TDS Category','Term','Territory','Ticket Category','UOM','Warehouse','Warehouse Type','Workflow Rule','Workstation'];
-
-// Set tips depending on conditions
-// ================================
-cur_frm.cscript.get_tips = function(doc, cdt, cdn){
-  
-  var next_step_list = pscript.tip_doc_dict[cur_frm.doctype];
-  // from is shown in print format
-  
-  
-  if(!cur_frm.editable && cur_frm.doctype!='Enquiry' && pscript.master_doctype_lst.join().indexOf(cur_frm.doctype)<0){
-    cur_frm.set_tip("Click on the 
Edit
 button above to edit this " + get_doctype_label(cur_frm.doctype) + ".");
-  }
-  
-  
-  // form is not in print format
-  if(cur_frm.editable){
-    // new doc
-    if(pscript.master_doctype_lst.join().indexOf(cur_frm.doctype)>=0){
-      if(doc.__islocal)
-        cur_frm.set_tip("To create " + get_doctype_label(cur_frm.doctype) + " please start by entering all the mandatory fields (marked 
 Red
).

 You can then save this form by clicking on the 
Save
 button in the above toolbar.");
-      else
-        cur_frm.set_tip("You have saved this " + get_doctype_label(cur_frm.doctype) + ".");
-    }
-    else {
-      if(doc.__islocal){
-        if(doc.status=='Cancelled' || doc.amended_from)
-          cur_frm.set_tip("You can now make changes in this " + get_doctype_label(cur_frm.doctype) + " and save it by clicking on the 
Save
 button in the above toolbar.");
-        else 
-          cur_frm.set_tip("To create " + get_doctype_label(cur_frm.doctype) + " please start by entering all the mandatory fields (marked 
 Red
).

 You can then save this form by clicking on the 
Save
 button in the above toolbar.");
-      }
-      
-      // doc exists
-      else if(!doc.__islocal){
-        // execute when doc is saved
-        //if(doc.docstatus==0 && cur_frm.doctype!='Enquiry' && cur_frm.doctype!='Lead')
-        if(doc.docstatus==0 && cur_frm.doctype!='Lead')
-          cur_frm.set_tip("You have saved your " + get_doctype_label(cur_frm.doctype) + ". You can make this draft permanent by clicking on 
Submit
 button above.");
-          
-        // execute if doc has only save permission
-        //else if(doc.docstatus==0 && (cur_frm.doctype=='Enquiry' || cur_frm.doctype=='Lead')){
-        else if(doc.docstatus==0 && (cur_frm.doctype=='Lead')){
-          cur_frm.set_tip("You have saved this " + get_doctype_label(cur_frm.doctype) + ".");
-          for(var i=0; iNext Steps tab below and click the button to create a " + next_step_list[i] +".");
-            else  cur_frm.append_tip("You can also create a " + next_step_list[i] + " against this " + get_doctype_label(cur_frm.doctype) + ".");
-          }
-        }
-        // execute if doc is submitted
-        else if(doc.docstatus==1){
-          cur_frm.set_tip("You have submitted this " + get_doctype_label(cur_frm.doctype) + ".");
-          for(var i=0; iCancel button above.)");
-        }
-        
-        // execute when doc is amended
-        else if(doc.docstatus==2){
-          cur_frm.set_tip("To make this " + get_doctype_label(cur_frm.doctype) + " editable click on the 
Amend
 button above.");
-        }
-      }
-    }
-  }
-}
-
-// Executes when doc is edit status of doc is changed
-// ==================================================
-cur_frm.cscript.edit_status_changed = function(doc, cdt, cdn){
-  cur_frm.cscript.get_tips();
-}
-
-
-// Executes when module page is loaded
-pscript.show_module_stats = function(parent, module)
-{
-  this.parent = parent;
-  this.module = module;
-  alert(profile.can_read)
-  //msgprint(parent, 1);
-  msgprint(module, 1);
-}
\ No newline at end of file
diff --git a/application_internal/doctype/tips_common/tips_common.txt b/application_internal/doctype/tips_common/tips_common.txt
deleted file mode 100644
index a97073b9b8..0000000000
--- a/application_internal/doctype/tips_common/tips_common.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-05-28 10:32:20', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 53, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': '', 'name': 'Tips Common', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/application_internal/doctype/transfer_account/transfer_account.txt b/application_internal/doctype/transfer_account/transfer_account.txt
deleted file mode 100644
index 3b1411381a..0000000000
--- a/application_internal/doctype/transfer_account/transfer_account.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-04-29 15:01:32', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 15, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': '', 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': None, 'name': 'Transfer Account', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': '', 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-07-22 12:42:01', 'doctype': 'DocField', 'oldfieldname': 'app_name', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'App Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Transfer Account', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05678', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-08-08 14:46:57', 'parenttype': 'DocType', 'fieldname': 'app_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-04-29 15:01:32', 'doctype': 'DocField', 'oldfieldname': 'server', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Server', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Transfer Account', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01936', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-08-08 14:46:57', 'parenttype': 'DocType', 'fieldname': 'server', 'fieldtype': 'Select', 'options': '67.205.111.118\n72.55.168.105\n173.201.16.242\nwww.kfcommunity.com\n67.205.74.201\nwww.webnotesframework.org\ns2.iwebnotes.com\ns4.iwebnotes.com\nold.iwebnotes.com', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-04-29 15:01:32', 'doctype': 'DocField', 'oldfieldname': 'path', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Path', 'width': '50px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Transfer Account', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01937', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-08-08 14:46:57', 'parenttype': 'DocType', 'fieldname': 'path', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-04-29 15:01:32', 'doctype': 'DocField', 'oldfieldname': 'account', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Account', 'width': '', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Transfer Account', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01938', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-08-08 14:46:57', 'parenttype': 'DocType', 'fieldname': 'account', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Password', 'creation': '2009-04-29 15:01:32', 'doctype': 'DocField', 'oldfieldname': 'admin_password', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Admin Password', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Transfer Account', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01939', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-08-08 14:46:57', 'parenttype': 'DocType', 'fieldname': 'admin_password', 'fieldtype': 'Password', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Check', 'creation': '2009-04-29 15:01:32', 'doctype': 'DocField', 'oldfieldname': 'transfer', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Transfer', 'width': '', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Transfer Account', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01940', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-08-08 14:46:57', 'parenttype': 'DocType', 'fieldname': 'transfer', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/application_internal/doctype/transfer_control/transfer_control.js b/application_internal/doctype/transfer_control/transfer_control.js
deleted file mode 100644
index 29b6c339da..0000000000
--- a/application_internal/doctype/transfer_control/transfer_control.js
+++ /dev/null
@@ -1,140 +0,0 @@
-# Note:
-# You must add the DocType to the override_transfer dict, else it will replace everything
-# ---------------------------------------------------------------------------------------
-
-class DocType:
-  def __init__(self, doc, doclist):
-    self.doc, self.doclist = doc, doclist
-    
-    # Over-ride function dict
-    # -----------------------
-    
-    self.override_transfer = {
-      'DocType':'ovr_doctype',
-      'DocType Mapper':'ovr_mapper'
-    }
-
-  def ovr_doctype(self, doclist, ovr, ignore, onupdate):
-    doclist = [Document(fielddata = d) for d in doclist]
-    doc = doclist[0]
-    orig_modified = doc.modified
-    cur_doc = Document('DocType',doc.name)
-    added = 0
-    prevfield = ''
-    prevlabel = ''
-    idx = 0
-        
-    # fields
-    # ------
-    for d in getlist(doclist, 'fields'):
-      fld = ''
-      # if exists
-      if d.fieldname:
-        fld = sql("select name from tabDocField where fieldname=%s and parent=%s", (d.fieldname, d.parent))
-      elif d.label: # for buttons where there is no fieldname
-        fld = sql("select name from tabDocField where label=%s and parent=%s", (d.label, d.parent))
-  
-      if (not fld) and d.label: # must have label
-        if prevfield:
-          idx = sql("select idx from tabDocField where fieldname = %s and parent = %s",(prevfield,d.parent))[0][0]
-        elif prevlabel and not prevfield:
-          idx = sql("select idx from tabDocField where label = %s and parent = %s",(prevlabel,d.parent))[0][0]
-        sql("update tabDocField set idx = idx + 1 where parent=%s and idx > %s", (d.parent, cint(idx)))          
-        
-        # add field
-        nd = Document(fielddata = d.fields)
-        nd.oldfieldname, nd.oldfieldtype = '', ''
-        nd.idx = cint(idx)+1
-        nd.save(new = 1, ignore_fields = ignore)
-        added += 1
-      if d.fieldname:
-        prevfield = d.fieldname
-        prevlabel = ''
-      elif d.label:
-        prevfield = ''
-        prevlabel = d.label
-        
-    # Print Formats
-    # ------
-    for d in getlist(doclist, 'formats'):
-      fld = ''
-      # if exists
-      if d.format:
-        fld = sql("select name from `tabDocFormat` where format=%s and parent=%s", (d.format, d.parent))
-            
-      if (not fld) and d.format: # must have label
-        # add field
-        nd = Document(fielddata = d.fields)
-        nd.oldfieldname, nd.oldfieldtype = '', ''
-        nd.save(new = 1, ignore_fields = ignore)
-        added += 1
-          
-    # code
-    # ----
-    
-    cur_doc.server_code_core = cstr(doc.server_code_core)
-    cur_doc.client_script_core = cstr(doc.client_script_core)
-    
-    cur_doc.save(ignore_fields = ignore)
-
-    if onupdate:
-      so = get_obj('DocType', doc.name, with_children = 1)
-      if hasattr(so, 'on_update'):
-        so.on_update()
-    
-    set(doc,'modified',orig_modified)
-    
-    if in_transaction: sql("COMMIT")
-  
-    return doc.name + (' Upgraded: %s fields added' % added)
-    
-  
-  def ovr_mapper(self, doclist, ovr, ignore, onupdate):
-    doclist = [Document(fielddata = d) for d in doclist]
-    doc = doclist[0]
-    orig_modified = doc.modified
-    cur_doc = Document('DocType Mapper',doc.name)
-    added = 0
-        
-    # Field Mapper Details fields
-    # ------
-    for d in getlist(doclist, 'field_mapper_details'):
-      fld = ''
-      # if exists
-      if d.from_field and d.to_field:
-        fld = sql("select name from `tabField Mapper Detail` where from_field=%s and to_field=%s and parent=%s", (d.from_field, d.to_field, d.parent))
-            
-      if (not fld) and d.from_field and d.to_field: # must have label
-        # add field
-        nd = Document(fielddata = d.fields)
-        nd.oldfieldname, nd.oldfieldtype = '', ''
-        nd.save(new = 1, ignore_fields = ignore)
-        added += 1
-        
-    # Table Mapper Details fields
-    # ------
-    for d in getlist(doclist, 'table_mapper_details'):
-      fld = ''
-      # if exists
-      if d.from_table and d.to_table: 
-        fld = sql("select name from `tabTable Mapper Detail` where from_table=%s and to_table = %s and parent=%s", (d.from_table, d.to_table, d.parent))
-            
-      if (not fld) and d.from_table and d.to_table: # must have label
-        # add field
-        nd = Document(fielddata = d.fields)
-        nd.oldfieldname, nd.oldfieldtype = '', ''
-        nd.save(new = 1, ignore_fields = ignore)
-        added += 1
-             
-    cur_doc.save(ignore_fields = ignore)
-    
-    if onupdate:
-      so = get_obj('DocType Mapper', doc.name, with_children = 1)
-      if hasattr(so, 'on_update'):
-        so.on_update()
-    
-    set(doc,'modified',orig_modified)
-    
-    if in_transaction: sql("COMMIT")
-    
-    return doc.name + (' Upgraded: %s fields added' % added)
\ No newline at end of file
diff --git a/application_internal/doctype/transfer_control/transfer_control.py b/application_internal/doctype/transfer_control/transfer_control.py
deleted file mode 100644
index 30383542ec..0000000000
--- a/application_internal/doctype/transfer_control/transfer_control.py
+++ /dev/null
@@ -1,249 +0,0 @@
-# Please edit this list and import only required elements
-import webnotes
-
-from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
-from webnotes.model import db_exists
-from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType
-from webnotes.model.doclist import getlist, copy_doclist
-from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
-from webnotes import session, form, is_testing, msgprint, errprint
-
-set = webnotes.conn.set
-sql = webnotes.conn.sql
-get_value = webnotes.conn.get_value
-in_transaction = webnotes.conn.in_transaction
-convert_to_lists = webnotes.conn.convert_to_lists
-	
-# -----------------------------------------------------------------------------------------
-
-
-# Note:
-# You must add the DocType to the override_transfer dict, else it will replace everything
-# ---------------------------------------------------------------------------------------
-
-class DocType:
-  def __init__(self, doc, doclist):
-    self.doc, self.doclist = doc, doclist
-    
-    # Over-ride function dict
-    # -----------------------
-    
-    self.override_transfer = {
-      'DocType':'ovr_doctype',
-      'DocType Mapper':'ovr_mapper',
-      'TDS Rate Chart':'ovr_tds'
-    }
-
-  def ovr_doctype(self, doclist, ovr, ignore, onupdate):
-    doclist = [Document(fielddata = d) for d in doclist]
-    doc = doclist[0]
-    orig_modified = doc.modified
-    cur_doc = Document('DocType',doc.name)
-    added = 0
-    prevfield = ''
-    prevlabel = ''
-    idx = 0
-    fld_lst = ''
-        
-    # fields
-    # ------
-    for d in getlist(doclist, 'fields'):
-      fld = ''
-      # if exists
-      if d.fieldname:
-        fld = sql("select name from tabDocField where fieldname=%s and parent=%s", (d.fieldname, d.parent))
-      elif d.label: # for buttons where there is no fieldname
-        fld = sql("select name from tabDocField where label=%s and parent=%s", (d.label, d.parent))
-
-      if (not fld) and d.label: # must have label
-        if prevfield:
-          idx = sql("select idx from tabDocField where fieldname = %s and parent = %s",(prevfield,d.parent))[0][0]
-        elif prevlabel and not prevfield:
-          idx = sql("select idx from tabDocField where label = %s and parent = %s",(prevlabel,d.parent))[0][0]
-        sql("update tabDocField set idx = idx + 1 where parent=%s and idx > %s", (d.parent, cint(idx)))          
-
-        # add field
-        nd = Document(fielddata = d.fields)
-        nd.oldfieldname, nd.oldfieldtype = '', ''
-        nd.idx = cint(idx)+1
-        nd.save(new = 1, ignore_fields = ignore, check_links = 0)
-        fld_lst += "\n"+'Label : '+cstr(d.label)+'   ---   Fieldtype : '+cstr(d.fieldtype)+'   ---   Fieldname : '+cstr(d.fieldname)+'   ---   Options : '+cstr(d.options)
-        added += 1
-      if d.fieldname:
-        prevfield = d.fieldname
-        prevlabel = ''
-      elif d.label:
-        prevfield = ''
-        prevlabel = d.label
-        
-    # Print Formats
-    # ------
-    for d in getlist(doclist, 'formats'):
-      fld = ''
-      # if exists
-      if d.format:
-        fld = sql("select name from `tabDocFormat` where format=%s and parent=%s", (d.format, d.parent))
-            
-      if (not fld) and d.format: # must have label
-        # add field
-        nd = Document(fielddata = d.fields)
-        nd.oldfieldname, nd.oldfieldtype = '', ''
-        nd.save(new = 1, ignore_fields = ignore, check_links = 0)
-        fld_lst = fld_lst + "\n"+'Format : '+cstr(d.format)
-        added += 1
-          
-    # code
-    # ----
-    
-    cur_doc.server_code_core = cstr(doc.server_code_core)
-    cur_doc.client_script_core = cstr(doc.client_script_core)
-    
-    cur_doc.save(ignore_fields = ignore, check_links = 0)
-
-    if version=='v160':
-      so = get_obj('DocType', doc.name, with_children = 1)
-      if hasattr(so, 'on_update'):
-        so.on_update()
-    elif version=='v170':
-      import webnotes.model.doctype
-      try: 
-        webnotes.model.doctype.update_doctype(so.doclist)
-      except: 
-        pass
-    
-    set(doc,'modified',orig_modified)
-    
-    if in_transaction: sql("COMMIT")
-    
-    if added == 0:
-      added_fields = ''
-    else:
-      added_fields =  ' 
Added Fields :- '+ cstr(fld_lst)+ '
'
-      
-    return doc.name + (' Upgraded: %s fields added' % added)+added_fields
-    
-  
-  def ovr_mapper(self, doclist, ovr, ignore, onupdate):
-    doclist = [Document(fielddata = d) for d in doclist]
-    doc = doclist[0]
-    orig_modified = doc.modified
-    cur_doc = Document('DocType Mapper',doc.name)
-    added = 0
-    fld_lst = ''
-        
-    # Field Mapper Details fields
-    # ------
-    for d in getlist(doclist, 'field_mapper_details'):
-      fld = ''
-      # if exists
-      if d.from_field and d.to_field:
-        fld = sql("select name from `tabField Mapper Detail` where from_field=%s and to_field=%s and parent=%s", (d.from_field, d.to_field, d.parent))
-            
-      if (not fld) and d.from_field and d.to_field: # must have label
-        # add field
-        nd = Document(fielddata = d.fields)
-        nd.oldfieldname, nd.oldfieldtype = '', ''
-        nd.save(new = 1, ignore_fields = ignore, check_links = 0)
-        fld_lst += "\n"+'From Field : '+cstr(d.from_field)+'   ---   To Field : '+cstr(d.to_field)
-        added += 1
-        
-    # Table Mapper Details fields
-    # ------
-    for d in getlist(doclist, 'table_mapper_details'):
-      fld = ''
-      # if exists
-      if d.from_table and d.to_table: 
-        fld = sql("select name from `tabTable Mapper Detail` where from_table=%s and to_table = %s and parent=%s", (d.from_table, d.to_table, d.parent))
-            
-      if (not fld) and d.from_table and d.to_table: # must have label
-        # add field
-        nd = Document(fielddata = d.fields)
-        nd.oldfieldname, nd.oldfieldtype = '', ''
-        nd.save(new = 1, ignore_fields = ignore, check_links = 0)
-        fld_lst += "\n"+'From Table : '+cstr(d.from_table)+'   ---   To Table : '+cstr(d.to_table)
-        added += 1
-             
-    cur_doc.save(ignore_fields = ignore, check_links = 0)
-    
-    if onupdate:
-      so = get_obj('DocType Mapper', doc.name, with_children = 1)
-      if hasattr(so, 'on_update'):
-        so.on_update()
-    
-    set(doc,'modified',orig_modified)
-    
-    if in_transaction: sql("COMMIT")
-    
-    if added == 0:
-      added_fields = ''
-    else:
-      added_fields =  ' 
Added Fields :- '+ cstr(fld_lst)+ '
' 
-    return doc.name + (' Upgraded: %s fields added' % added)+added_fields
-    
-    
-  def ovr_tds(self, doclist, ovr, ignore, onupdate):
-    doclist = [Document(fielddata = d) for d in doclist]
-    doc = doclist[0]
-    orig_modified = doc.modified
-    cur_doc = Document('TDS Rate Chart',doc.name)
-    added = 0
-    fld_lst = ''
-        
-    # TDS RATE CHART DETAIL fields
-    # ------
-    for d in getlist(doclist,'rate_chart_detail'):
-      fld = ''
-      # if exists
-      if d.category and d.slab_from and d.slab_to:
-        fld = sql("select name from `tabTDS Rate Detail` where category=%s and slab_from=%s and slab_to = %s and parent=%s", (d.category, d.slab_from, d.slab_to, d.parent))
-              
-      if (not fld) and d.category and d.slab_from and d.slab_to:
-        # add field
-        nd = Document(fielddata = d.fields)
-        nd.oldfieldname, nd.oldfieldtype = '', ''
-        nd.save(new = 1, ignore_fields = ignore, check_links = 0)
-        fld_lst += "\n"+'Category : '+cstr(d.category)+'   ---   Slab From : '+cstr(d.slab_from)+ '   ---   Slab To : '+cstr(d.slab_to)
-        added += 1
-    
-    cur_doc.save(ignore_fields = ignore)
-    
-    if onupdate:
-      so = get_obj('TDS Rate Chart', doc.name, with_children = 1)
-      if hasattr(so, 'on_update'):
-        so.on_update()
-    
-    set(doc,'modified',orig_modified)
-    
-    if in_transaction: sql("COMMIT")
-    if added == 0:
-      added_fields = ''
-    else:
-      added_fields =  ' 
Added Fields :- '+ cstr(fld_lst)+ '
' 
-    
-    return doc.name + (' Upgraded: %s fields added' % added)+added_fields
-
-  def get_all_modules(self, args):
-    if args == 'Import':
-      from webnotes.utils import module_manager
-      return module_manager.get_modules_from_filesystem()
-    elif args == 'Export':
-      return get_modules_from_table()
-
-   
-  def get_modules_from_table(self):
-    from webnotes import handler
-    out = webnotes.session
-    handler.get_modules()
-    return out['mod_list']
-       
-
-
-  def export_records(self,args):
-    args = eval(args)
-    msgprint(args)
-    from webnotes.utils import module_manager
-    module_manager.export_to_files(args['modules'],args['record_list'])
- 
-  def import_records(self,modules,doctyp_list,execute_patch,sync_cp):
-    from webnotes.utils import module_manager
-    module_manager.import_from_files(modules,doctyp_list,execute_patch,sync_cp)
\ No newline at end of file
diff --git a/application_internal/doctype/transfer_control/transfer_control.txt b/application_internal/doctype/transfer_control/transfer_control.txt
deleted file mode 100644
index 2d971be07a..0000000000
--- a/application_internal/doctype/transfer_control/transfer_control.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-05-28 12:41:41', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 40, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': '', 'name': 'Transfer Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-11-12 16:41:58', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/application_internal/doctype/transfer_module/transfer_module.txt b/application_internal/doctype/transfer_module/transfer_module.txt
deleted file mode 100644
index 3b5155b089..0000000000
--- a/application_internal/doctype/transfer_module/transfer_module.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-04-29 15:02:21', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 2, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': '', 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Transfer Module', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': '', 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-04-29 15:02:21', 'doctype': 'DocField', 'oldfieldname': 'module', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Module', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Transfer Module', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01941', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-03-31 11:10:53', 'parenttype': 'DocType', 'fieldname': 'module', 'fieldtype': 'Link', 'options': 'Module Def', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Check', 'creation': '2009-04-29 15:02:21', 'doctype': 'DocField', 'oldfieldname': 'transfer', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Transfer', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Transfer Module', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01942', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-03-31 11:10:53', 'parenttype': 'DocType', 'fieldname': 'transfer', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/application_internal/doctype/wn_account_control/wn_account_control.py b/application_internal/doctype/wn_account_control/wn_account_control.py
deleted file mode 100644
index 6893df7106..0000000000
--- a/application_internal/doctype/wn_account_control/wn_account_control.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# Please edit this list and import only required elements
-import webnotes
-
-from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
-from webnotes.model import db_exists
-from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType
-from webnotes.model.doclist import getlist, copy_doclist
-from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
-from webnotes import session, form, is_testing, msgprint, errprint
-
-set = webnotes.conn.set
-sql = webnotes.conn.sql
-get_value = webnotes.conn.get_value
-in_transaction = webnotes.conn.in_transaction
-convert_to_lists = webnotes.conn.convert_to_lists
-	
-# -----------------------------------------------------------------------------------------
-
-
-class DocType:
-  def __init__(self,doc,doclist):
-    self.doc = doc
-    self.doclist = doclist
-
-  def get_users(self):
-    ret = sql("select name from tabProfile where name!='Administrator' and name!='Guest' and enabled=1")
-    return ret
-
-  def remove_users(self,args):
-    args = eval(args)
-    #for user in args['app_user_list']:
-      #sql("update tabProfile set enabled=0 where email=%s",(user))
-
-  def create_users_profile(self,args):
-    args = eval(args)
-    for email_id in args['user_email_ids']:
-      if sql("select email from tabProfile where email=%s",(email_id)):
-        p = Document('Profile',email_id)
-        p.enabled = 1
-        p.save()
-      else:  
-        p = Document('Profile')
-        p.email = email_id
-        p.save(1)
\ No newline at end of file
diff --git a/application_internal/doctype/wn_account_control/wn_account_control.txt b/application_internal/doctype/wn_account_control/wn_account_control.txt
deleted file mode 100644
index 73a187ca94..0000000000
--- a/application_internal/doctype/wn_account_control/wn_account_control.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-03-18 11:09:04', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 2, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'WN Account Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/application_internal/doctype/wn_erp_client_control/wn_erp_client_control.txt b/application_internal/doctype/wn_erp_client_control/wn_erp_client_control.txt
deleted file mode 100644
index ac155c9cfd..0000000000
--- a/application_internal/doctype/wn_erp_client_control/wn_erp_client_control.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-02 16:26:28', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 0, 'read_only': 0, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 140, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 0, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'nabin@webnotestech.com', 'document_type': None, 'name': 'WN ERP Client Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM00756', 'parent': 'WN ERP Client Control', 'read': 1, 'create': 1, 'creation': '2010-04-02 16:26:28', 'modified': '2010-09-06 10:47:10', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM01003', 'parent': 'WN ERP Client Control', 'read': 1, 'create': None, 'creation': '2010-05-19 13:59:52', 'modified': '2010-09-06 10:47:10', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'saumil@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-04-02 16:26:28', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Account Start Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'WN ERP Client Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04619', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-06 10:47:10', 'parenttype': 'DocType', 'fieldname': 'account_start_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-05-14 10:50:40', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Billing Cycle Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'WN ERP Client Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05025', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-06 10:47:10', 'parenttype': 'DocType', 'fieldname': 'billing_cycle_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-04-02 16:26:28', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Total Users', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'WN ERP Client Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04620', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-06 10:47:10', 'parenttype': 'DocType', 'fieldname': 'total_users', 'fieldtype': 'Int', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-05-13 11:34:29', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'saumil@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Credit Balance', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'WN ERP Client Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05021', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-09-06 10:47:10', 'parenttype': 'DocType', 'fieldname': 'credit_balance', 'fieldtype': 'Int', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-04-02 16:26:28', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Is Trial Account', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'WN ERP Client Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04623', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-09-06 10:47:10', 'parenttype': 'DocType', 'fieldname': 'is_trial_account', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-05-19 13:59:28', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'saumil@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Last Credit Deduction Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'WN ERP Client Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05029', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-09-06 10:47:10', 'parenttype': 'DocType', 'fieldname': 'last_deduction_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/srm/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt b/buying/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt
similarity index 100%
rename from srm/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt
rename to buying/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt
diff --git a/mapper/DocType Mapper/Sales Order-Indent/Sales Order-Indent.txt b/buying/DocType Mapper/Sales Order-Indent/Sales Order-Indent.txt
similarity index 100%
rename from mapper/DocType Mapper/Sales Order-Indent/Sales Order-Indent.txt
rename to buying/DocType Mapper/Sales Order-Indent/Sales Order-Indent.txt
diff --git a/srm/Module Def/SRM/SRM.txt b/buying/Module Def/Buying/Buying.txt
similarity index 69%
rename from srm/Module Def/SRM/SRM.txt
rename to buying/Module Def/Buying/Buying.txt
index cbbc2b13ae..eab2ef3ef0 100644
--- a/srm/Module Def/SRM/SRM.txt	
+++ b/buying/Module Def/Buying/Buying.txt	
@@ -1,23 +1,24 @@
 [
 	{
-		'creation': '2010-09-25 10:50:35',
+		'_last_update': None,
+		'creation': '2011-06-30 15:47:45',
 		'disabled': 'No',
 		'docstatus': 0,
-		'doctype': 'Module Def',
+		'doctype': u'Module Def',
 		'doctype_list': 'DocType Mapper, Purchase Receipt-Payable Voucher\nDocType Mapper, Purchase Order-Payable Voucher\nDocType Mapper, Purchase Order-Purchase Receipt\nDocType Mapper, Indent-Purchase Order\nPrint Format, Purchase Order Format\nPrint Format, Purchase Receipt Format',
 		'file_list': 'scm.gif,FileData/00209',
 		'idx': None,
-		'is_hidden': None,
-		'last_updated_date': '2010-11-29 12:02:02',
-		'modified': '2011-04-14 10:22:42',
+		'is_hidden': 'No',
+		'last_updated_date': None,
+		'modified': '2011-06-30 15:47:45',
 		'modified_by': 'Administrator',
 		'module_desc': '
All details about your Suppliers and past transactions
',
 		'module_icon': 'Buying.gif',
 		'module_label': 'Buying',
-		'module_name': 'SRM',
+		'module_name': 'Buying',
 		'module_page': None,
 		'module_seq': 4,
-		'name': 'SRM',
+		'name': 'Buying',
 		'owner': 'Administrator',
 		'parent': None,
 		'parentfield': None,
@@ -27,7 +28,7 @@
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:47:45',
 		'description': 'Your Supplier Database',
 		'display_name': 'Supplier',
 		'doc_name': 'Supplier',
@@ -38,17 +39,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 1,
-		'modified': '2011-05-09 11:04:26',
+		'modified': '2011-06-30 15:47:45',
 		'modified_by': 'Administrator',
-		'name': 'MDI01067',
+		'name': 'MDI01312',
 		'owner': 'Administrator',
-		'parent': 'SRM',
+		'parent': 'Buying',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:47:45',
 		'description': 'Buy requests from various people in your company',
 		'display_name': 'Indent',
 		'doc_name': 'Indent',
@@ -59,17 +60,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 2,
-		'modified': '2011-05-09 11:04:26',
+		'modified': '2011-06-30 15:47:45',
 		'modified_by': 'Administrator',
-		'name': 'MDI01068',
+		'name': 'MDI01313',
 		'owner': 'Administrator',
-		'parent': 'SRM',
+		'parent': 'Buying',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:47:45',
 		'description': 'Orders you have placed to your suppliers',
 		'display_name': 'Purchase Order',
 		'doc_name': 'Purchase Order',
@@ -80,17 +81,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 3,
-		'modified': '2011-05-09 11:04:26',
+		'modified': '2011-06-30 15:47:45',
 		'modified_by': 'Administrator',
-		'name': 'MDI01069',
+		'name': 'MDI01314',
 		'owner': 'Administrator',
-		'parent': 'SRM',
+		'parent': 'Buying',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:47:45',
 		'description': None,
 		'display_name': 'Itemwise Receipt Details',
 		'doc_name': 'Purchase Receipt Detail',
@@ -101,17 +102,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 4,
-		'modified': '2011-05-09 11:04:26',
+		'modified': '2011-06-30 15:47:45',
 		'modified_by': 'Administrator',
-		'name': 'MDI01071',
+		'name': 'MDI01315',
 		'owner': 'Administrator',
-		'parent': 'SRM',
+		'parent': 'Buying',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:47:45',
 		'description': None,
 		'display_name': 'Purchase in Transit',
 		'doc_name': 'PV Detail',
@@ -122,17 +123,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 5,
-		'modified': '2011-05-09 11:04:26',
+		'modified': '2011-06-30 15:47:45',
 		'modified_by': 'Administrator',
-		'name': 'MDI01072',
+		'name': 'MDI01316',
 		'owner': 'Administrator',
-		'parent': 'SRM',
+		'parent': 'Buying',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:47:45',
 		'description': None,
 		'display_name': 'Pending PO Items To Receive',
 		'doc_name': 'PO Detail',
@@ -143,17 +144,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 6,
-		'modified': '2011-05-09 11:04:26',
+		'modified': '2011-06-30 15:47:45',
 		'modified_by': 'Administrator',
-		'name': 'MDI01073',
+		'name': 'MDI01317',
 		'owner': 'Administrator',
-		'parent': 'SRM',
+		'parent': 'Buying',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:47:45',
 		'description': None,
 		'display_name': 'Pending PO Items To Bill',
 		'doc_name': 'PO Detail',
@@ -164,17 +165,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 7,
-		'modified': '2011-05-09 11:04:26',
+		'modified': '2011-06-30 15:47:45',
 		'modified_by': 'Administrator',
-		'name': 'MDI01074',
+		'name': 'MDI01318',
 		'owner': 'Administrator',
-		'parent': 'SRM',
+		'parent': 'Buying',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:47:45',
 		'description': None,
 		'display_name': 'Itemwise Purchase Details',
 		'doc_name': 'PO Detail',
@@ -185,17 +186,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 8,
-		'modified': '2011-05-09 11:04:26',
+		'modified': '2011-06-30 15:47:45',
 		'modified_by': 'Administrator',
-		'name': 'MDI01075',
+		'name': 'MDI01319',
 		'owner': 'Administrator',
-		'parent': 'SRM',
+		'parent': 'Buying',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-12-14 10:33:10',
+		'creation': '2011-06-30 15:47:45',
 		'description': 'Ledger details of your creditors',
 		'display_name': "Creditor's Ledger",
 		'doc_name': 'GL Entry',
@@ -206,87 +207,66 @@
 		'hide': None,
 		'icon': 'accept.gif',
 		'idx': 9,
-		'modified': '2011-05-09 11:04:26',
+		'modified': '2011-06-30 15:47:45',
 		'modified_by': 'Administrator',
-		'name': 'MDI01206',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'SRM',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-05-09 11:04:26',
-		'description': 'You can calculate landed cost of stock by distributing some costs proportionately (based on amount) to several Purchase Receipts through this wizard.',
-		'display_name': 'Landed Cost Wizard',
-		'doc_name': 'Landed Cost Wizard',
-		'doc_type': 'Single DocType',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 10,
-		'modified': '2011-05-09 11:04:26',
-		'modified_by': 'Administrator',
-		'name': '000000411',
+		'name': 'MDI01320',
 		'owner': 'Administrator',
-		'parent': 'SRM',
+		'parent': 'Buying',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:47:45',
 		'docstatus': 0,
 		'doctype': 'Module Def Role',
 		'idx': 1,
-		'modified': '2010-09-25 10:50:35',
+		'modified': '2011-06-30 15:47:45',
 		'modified_by': 'Administrator',
-		'name': 'MDR00288',
+		'name': 'MDR00332',
 		'owner': 'Administrator',
-		'parent': 'SRM',
+		'parent': 'Buying',
 		'parentfield': 'roles',
 		'parenttype': 'Module Def',
 		'role': 'Purchase User'
 	},
 	{
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:47:45',
 		'docstatus': 0,
 		'doctype': 'Module Def Role',
 		'idx': 2,
-		'modified': '2010-09-25 10:50:35',
+		'modified': '2011-06-30 15:47:45',
 		'modified_by': 'Administrator',
-		'name': 'MDR00289',
+		'name': 'MDR00333',
 		'owner': 'Administrator',
-		'parent': 'SRM',
+		'parent': 'Buying',
 		'parentfield': 'roles',
 		'parenttype': 'Module Def',
 		'role': 'Purchase Manager'
 	},
 	{
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:47:45',
 		'docstatus': 0,
 		'doctype': 'Module Def Role',
 		'idx': 3,
-		'modified': '2010-09-25 10:50:35',
+		'modified': '2011-06-30 15:47:45',
 		'modified_by': 'Administrator',
-		'name': 'MDR00290',
+		'name': 'MDR00334',
 		'owner': 'Administrator',
-		'parent': 'SRM',
+		'parent': 'Buying',
 		'parentfield': 'roles',
 		'parenttype': 'Module Def',
 		'role': 'Administrator'
 	},
 	{
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:47:45',
 		'docstatus': 0,
 		'doctype': 'Module Def Role',
 		'idx': 4,
-		'modified': '2010-09-25 10:50:35',
+		'modified': '2011-06-30 15:47:45',
 		'modified_by': 'Administrator',
-		'name': 'MDR00291',
+		'name': 'MDR00335',
 		'owner': 'Administrator',
-		'parent': 'SRM',
+		'parent': 'Buying',
 		'parentfield': 'roles',
 		'parenttype': 'Module Def',
 		'role': 'Purchase Master Manager'
diff --git a/roles/Role/Purchase Manager/Purchase Manager.txt b/buying/Role/Purchase Manager/Purchase Manager.txt
similarity index 100%
rename from roles/Role/Purchase Manager/Purchase Manager.txt
rename to buying/Role/Purchase Manager/Purchase Manager.txt
diff --git a/roles/Role/Purchase Master Manager/Purchase Master Manager.txt b/buying/Role/Purchase Master Manager/Purchase Master Manager.txt
similarity index 100%
rename from roles/Role/Purchase Master Manager/Purchase Master Manager.txt
rename to buying/Role/Purchase Master Manager/Purchase Master Manager.txt
diff --git a/roles/Role/Purchase User/Purchase User.txt b/buying/Role/Purchase User/Purchase User.txt
similarity index 100%
rename from roles/Role/Purchase User/Purchase User.txt
rename to buying/Role/Purchase User/Purchase User.txt
diff --git a/roles/Role/Supplier/Supplier.txt b/buying/Role/Supplier/Supplier.txt
similarity index 100%
rename from roles/Role/Supplier/Supplier.txt
rename to buying/Role/Supplier/Supplier.txt
diff --git a/accounts/doctype/accounts_setup/__init__.py b/buying/__init__.py
similarity index 100%
rename from accounts/doctype/accounts_setup/__init__.py
rename to buying/__init__.py
diff --git a/accounts/doctype/pv_add_tax_detail/__init__.py b/buying/doctype/__init__.py
similarity index 100%
rename from accounts/doctype/pv_add_tax_detail/__init__.py
rename to buying/doctype/__init__.py
diff --git a/accounts/doctype/pv_ded_tax_detail/__init__.py b/buying/doctype/indent/__init__.py
similarity index 100%
rename from accounts/doctype/pv_ded_tax_detail/__init__.py
rename to buying/doctype/indent/__init__.py
diff --git a/srm/doctype/indent/indent.js b/buying/doctype/indent/indent.js
similarity index 90%
rename from srm/doctype/indent/indent.js
rename to buying/doctype/indent/indent.js
index 8d7ffb150c..f690252a16 100644
--- a/srm/doctype/indent/indent.js
+++ b/buying/doctype/indent/indent.js
@@ -93,24 +93,6 @@ cur_frm.cscript['Make Purchase Order'] = function() {
   );
 }
 
-// Make RFQ
-/*
-cur_frm.cscript['Create RFQ'] = function() {
-  var doc = cur_frm.doc;
-  n = createLocal('RFQ');
-  $c('dt_map', args={
-    'docs':compress_doclist([locals['RFQ'][n]]),
-    'from_doctype':doc.doctype,
-    'to_doctype':'RFQ',
-    'from_docname':doc.name,
-    'from_to_list':"[['Indent','RFQ'],['Indent Detail','RFQ Detail']]"
-    }, function(r,rt) {
-       loaddoc('RFQ', n);
-    }
-  );
-}
-*/
-
 // Stop INDENT
 // ==================================================================================================
 cur_frm.cscript['Stop Indent'] = function() {
diff --git a/srm/doctype/indent/indent.py b/buying/doctype/indent/indent.py
similarity index 97%
rename from srm/doctype/indent/indent.py
rename to buying/doctype/indent/indent.py
index 86a0f70feb..450ea641ea 100644
--- a/srm/doctype/indent/indent.py
+++ b/buying/doctype/indent/indent.py
@@ -192,14 +192,10 @@ class DocType:
 		
 		# Step 3:=> Check if Purchase Order has been submitted against current Indent
 		pc_obj.check_docstatus(check = 'Next', doctype = 'Purchase Order', docname = self.doc.name, detail_doctype = 'PO Detail')
-
-		# Step 4:=> Check if RFQ has been submitted against current Indent
-		#pc_obj.check_docstatus(check = 'Next', doctype = 'RFQ', docname = self.doc.name, detail_doctype = 'RFQ Detail')
-		
-		# Step 5:=> Update Bin
+		# Step 4:=> Update Bin
 		self.update_bin(is_submit = 0, is_stopped = (cstr(self.doc.status) == 'Stopped') and 1 or 0)
 		
-		# Step 6:=> Set Status
+		# Step 5:=> Set Status
 		set(self.doc,'status','Cancelled')
 
 
diff --git a/buying/doctype/indent/indent.txt b/buying/doctype/indent/indent.txt
new file mode 100644
index 0000000000..93767a8d20
--- /dev/null
+++ b/buying/doctype/indent/indent.txt
@@ -0,0 +1,551 @@
+# DocType, Indent
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:04',
+		'docstatus': 0,
+		'modified': '2011-05-04 14:53:17',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1304500997',
+		'allow_print': 0,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'Buying',
+		'name': '__common__',
+		'read_only_onload': 1,
+		'search_fields': 'status,transaction_date,sales_order_no',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': '%(per_ordered)s% ordered',
+		'version': 186
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Indent',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Indent',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Indent
+	{
+		'doctype': 'DocType',
+		'name': 'Indent'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Purchase Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Purchase Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Material Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Material Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 1,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 0,
+		'role': 'Material User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 7,
+		'permlevel': 0,
+		'role': 'Purchase User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 8,
+		'permlevel': 1,
+		'role': 'Purchase User'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Enter items and their details which are falling short in your warehouse and for which you want your purchase department to raise a purchase order.',
+		'description': 'Enter items and their details for which you want your purchase department to raise a purchase order.',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Basic Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 2,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'print_hide': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'To manage multiple series please go to Setup > Manage Series',
+		'doctype': 'DocField',
+		'fieldname': 'naming_series',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Series',
+		'no_copy': 1,
+		'oldfieldname': 'naming_series',
+		'oldfieldtype': 'Select',
+		'options': 'IDT',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Status',
+		'no_copy': 1,
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Select',
+		'options': '\nDraft\nSubmitted\nStopped\nCancelled',
+		'permlevel': 1,
+		'reqd': 0,
+		'search_index': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 5,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'The date at which current entry is made in system.',
+		'doctype': 'DocField',
+		'fieldname': 'transaction_date',
+		'fieldtype': 'Date',
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Indent Date',
+		'no_copy': 1,
+		'oldfieldname': 'transaction_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': '% of materials ordered against this Indent',
+		'doctype': 'DocField',
+		'fieldname': 'per_ordered',
+		'fieldtype': 'Currency',
+		'idx': 7,
+		'label': '% Ordered',
+		'no_copy': 1,
+		'oldfieldname': 'per_ordered',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 8,
+		'label': 'Items',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'One or multiple Sales Order no which generated this Indent',
+		'doctype': 'DocField',
+		'fieldname': 'sales_order_no',
+		'fieldtype': 'Link',
+		'idx': 9,
+		'label': 'Sales Order No',
+		'no_copy': 1,
+		'oldfieldname': 'sales_order_no',
+		'oldfieldtype': 'Data',
+		'options': 'Sales Order',
+		'permlevel': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 10,
+		'label': 'Pull Sales Order Details',
+		'options': 'pull_so_details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'indent_details',
+		'fieldtype': 'Table',
+		'idx': 11,
+		'label': 'Indent Details',
+		'no_copy': 0,
+		'oldfieldname': 'indent_details',
+		'oldfieldtype': 'Table',
+		'options': 'Indent Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Give additional details about the indent.',
+		'description': 'Filing in Additional Information about the Indent will help you analyze your data better.',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 12,
+		'label': 'More Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Select the relevant company name if you have multiple companies',
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 13,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 14,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Name of the entity who has requested for the indent',
+		'doctype': 'DocField',
+		'fieldname': 'requested_by',
+		'fieldtype': 'Data',
+		'idx': 15,
+		'label': 'Requested By',
+		'no_copy': 1,
+		'oldfieldname': 'requested_by',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 16,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'remark',
+		'fieldtype': 'Small Text',
+		'idx': 17,
+		'label': 'Remarks',
+		'no_copy': 1,
+		'oldfieldname': 'remark',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'print_hide': 0,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'After cancelling the indent, a dialog box will ask you reason for cancellation which will be reflected in this field',
+		'doctype': 'DocField',
+		'fieldname': 'cancel_reason',
+		'fieldtype': 'Data',
+		'idx': 18,
+		'label': 'Cancel Reason',
+		'no_copy': 1,
+		'oldfieldname': 'cancel_reason',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'idx': 19,
+		'label': 'Amended From',
+		'no_copy': 1,
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'description': 'The date at which current entry is corrected in the system.',
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'idx': 20,
+		'label': 'Amendment Date',
+		'no_copy': 1,
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'description': 'Add Terms and Conditions for the Indent. You can also prepare a master Term Sheet and use the Template',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 21,
+		'label': 'Terms',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'letter_head',
+		'fieldtype': 'Select',
+		'idx': 22,
+		'label': 'Letter Head',
+		'oldfieldname': 'letter_head',
+		'oldfieldtype': 'Select',
+		'options': 'link:Letter Head',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tc_name',
+		'fieldtype': 'Link',
+		'idx': 23,
+		'label': 'Select Terms',
+		'oldfieldname': 'tc_name',
+		'oldfieldtype': 'Link',
+		'options': 'Term',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 24,
+		'label': 'Get Terms',
+		'oldfieldtype': 'Button',
+		'options': 'get_tc_details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 25,
+		'label': 'Terms HTML',
+		'oldfieldtype': 'HTML',
+		'options': 'You can add Terms and Notes that will be printed in the Transaction',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'terms',
+		'fieldtype': 'Text Editor',
+		'idx': 26,
+		'label': 'Terms1',
+		'oldfieldname': 'terms',
+		'oldfieldtype': 'Text Editor',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 27,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 28,
+		'label': 'Repair Indent',
+		'oldfieldtype': 'Button',
+		'options': 'repair_indent',
+		'permlevel': 0,
+		'print_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/accounts/doctype/supplier_tds_category_detail/__init__.py b/buying/doctype/indent_detail/__init__.py
similarity index 100%
rename from accounts/doctype/supplier_tds_category_detail/__init__.py
rename to buying/doctype/indent_detail/__init__.py
diff --git a/buying/doctype/indent_detail/indent_detail.txt b/buying/doctype/indent_detail/indent_detail.txt
new file mode 100644
index 0000000000..c81b9cf4b2
--- /dev/null
+++ b/buying/doctype/indent_detail/indent_detail.txt
@@ -0,0 +1,275 @@
+# DocType, Indent Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:04',
+		'docstatus': 0,
+		'modified': '2011-05-04 14:41:43',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'IDTD/.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Buying',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 29
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Indent Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Indent Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Indent Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'schedule_date',
+		'fieldtype': 'Date',
+		'idx': 1,
+		'label': 'Required Date',
+		'no_copy': 1,
+		'oldfieldname': 'schedule_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_name',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Item Name',
+		'oldfieldname': 'item_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 4,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'reqd': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'warehouse',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'label': 'Warehouse',
+		'oldfieldname': 'warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 0,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'brand',
+		'fieldtype': 'Link',
+		'idx': 6,
+		'label': 'Brand',
+		'oldfieldname': 'brand',
+		'oldfieldtype': 'Link',
+		'options': 'Brand',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'item_group',
+		'fieldtype': 'Link',
+		'idx': 7,
+		'in_filter': 1,
+		'label': 'Item Group',
+		'no_copy': 0,
+		'oldfieldname': 'item_group',
+		'oldfieldtype': 'Link',
+		'options': 'Item Group',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'qty',
+		'fieldtype': 'Currency',
+		'idx': 8,
+		'label': 'Quantity',
+		'no_copy': 0,
+		'oldfieldname': 'qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client',
+		'width': '50px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'lead_time_date',
+		'fieldtype': 'Date',
+		'idx': 9,
+		'label': 'Lead Time Date',
+		'no_copy': 1,
+		'oldfieldname': 'lead_time_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'uom',
+		'fieldtype': 'Link',
+		'idx': 10,
+		'label': 'Stock UOM',
+		'no_copy': 0,
+		'oldfieldname': 'uom',
+		'oldfieldtype': 'Link',
+		'options': 'UOM',
+		'permlevel': 1,
+		'reqd': 1,
+		'width': '50px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'min_order_qty',
+		'fieldtype': 'Currency',
+		'idx': 11,
+		'label': 'Min Order Qty',
+		'no_copy': 1,
+		'oldfieldname': 'min_order_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0,
+		'width': '70px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'projected_qty',
+		'fieldtype': 'Currency',
+		'idx': 12,
+		'label': 'Projected Qty',
+		'no_copy': 1,
+		'oldfieldname': 'projected_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '70px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'ordered_qty',
+		'fieldtype': 'Currency',
+		'idx': 13,
+		'label': 'Ordered Qty',
+		'no_copy': 1,
+		'oldfieldname': 'ordered_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sales_order_no',
+		'fieldtype': 'Link',
+		'idx': 14,
+		'label': 'Sales Order No',
+		'no_copy': 1,
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'page_break',
+		'fieldtype': 'Check',
+		'idx': 15,
+		'label': 'Page Break',
+		'no_copy': 1,
+		'oldfieldname': 'page_break',
+		'oldfieldtype': 'Check',
+		'permlevel': 0,
+		'print_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/accounts/search_criteria/account___inputs_rg_23_a___part_ii_wrong_one/__init__.py b/buying/doctype/po_detail/__init__.py
similarity index 100%
rename from accounts/search_criteria/account___inputs_rg_23_a___part_ii_wrong_one/__init__.py
rename to buying/doctype/po_detail/__init__.py
diff --git a/buying/doctype/po_detail/po_detail.txt b/buying/doctype/po_detail/po_detail.txt
new file mode 100644
index 0000000000..9e4d790c0d
--- /dev/null
+++ b/buying/doctype/po_detail/po_detail.txt
@@ -0,0 +1,434 @@
+# DocType, PO Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:12',
+		'docstatus': 0,
+		'modified': '2010-11-12 16:53:30',
+		'modified_by': 'sneha@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'POD/.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Buying',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 46
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'PO Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, PO Detail
+	{
+		'doctype': 'DocType',
+		'name': 'PO Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'schedule_date',
+		'fieldtype': 'Date',
+		'hidden': 0,
+		'idx': 1,
+		'in_filter': 1,
+		'label': 'Reqd By Date',
+		'no_copy': 1,
+		'oldfieldname': 'schedule_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_name',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Item Name',
+		'oldfieldname': 'item_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Small Text',
+		'idx': 4,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'reqd': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'purchase_rate',
+		'fieldtype': 'Currency',
+		'idx': 7,
+		'label': 'Rate (Default Curr.)',
+		'oldfieldname': 'purchase_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'amount',
+		'fieldtype': 'Currency',
+		'idx': 8,
+		'label': 'Amount  (Default Curr.)',
+		'oldfieldname': 'amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'qty',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'label': 'Quantity',
+		'oldfieldname': 'qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client',
+		'width': '60px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'import_rate',
+		'fieldtype': 'Currency',
+		'hidden': 0,
+		'idx': 9,
+		'label': 'Rate',
+		'oldfieldname': 'import_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'uom',
+		'fieldtype': 'Link',
+		'idx': 10,
+		'label': 'UOM',
+		'oldfieldname': 'uom',
+		'oldfieldtype': 'Link',
+		'options': 'UOM',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'import_amount',
+		'fieldtype': 'Currency',
+		'idx': 10,
+		'label': 'Amount',
+		'oldfieldname': 'import_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'warehouse',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 11,
+		'label': 'Warehouse',
+		'oldfieldname': 'warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'conversion_factor',
+		'fieldtype': 'Currency',
+		'hidden': 0,
+		'idx': 11,
+		'label': 'Conversion Factor',
+		'oldfieldname': 'conversion_factor',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_doctype',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 12,
+		'label': 'Prevdoc DocType',
+		'no_copy': 0,
+		'oldfieldname': 'prevdoc_doctype',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_uom',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 12,
+		'label': 'Stock UOM',
+		'oldfieldname': 'stock_uom',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_docname',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 13,
+		'in_filter': 1,
+		'label': 'Indent No',
+		'no_copy': 0,
+		'oldfieldname': 'prevdoc_docname',
+		'oldfieldtype': 'Link',
+		'options': 'Indent',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 1,
+		'width': '120px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_date',
+		'fieldtype': 'Date',
+		'hidden': 0,
+		'idx': 14,
+		'in_filter': 1,
+		'label': 'Indent Date',
+		'oldfieldname': 'prevdoc_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_detail_docname',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 15,
+		'in_filter': 1,
+		'label': 'Indent Detail No',
+		'no_copy': 0,
+		'oldfieldname': 'prevdoc_detail_docname',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'brand',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 16,
+		'label': 'Brand',
+		'oldfieldname': 'brand',
+		'oldfieldtype': 'Link',
+		'options': 'Brand',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_group',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 17,
+		'in_filter': 1,
+		'label': 'Item Group',
+		'oldfieldname': 'item_group',
+		'oldfieldtype': 'Link',
+		'options': 'Item Group',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_qty',
+		'fieldtype': 'Currency',
+		'hidden': 0,
+		'idx': 20,
+		'label': 'Stock Qty',
+		'no_copy': 1,
+		'oldfieldname': 'stock_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'received_qty',
+		'fieldtype': 'Currency',
+		'hidden': 0,
+		'idx': 21,
+		'label': 'Received Qty',
+		'no_copy': 1,
+		'oldfieldname': 'received_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'billed_qty',
+		'fieldtype': 'Currency',
+		'hidden': 0,
+		'idx': 22,
+		'label': 'Billed Quantity',
+		'no_copy': 1,
+		'oldfieldname': 'billed_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Tax detail table fetched from item master as a string and stored in this field.\nUsed for Purchase Other Charges',
+		'doctype': 'DocField',
+		'fieldname': 'item_tax_rate',
+		'fieldtype': 'Small Text',
+		'hidden': 1,
+		'idx': 23,
+		'label': 'Item Tax Rate',
+		'oldfieldname': 'item_tax_rate',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'page_break',
+		'fieldtype': 'Check',
+		'hidden': 0,
+		'idx': 24,
+		'label': 'Page Break',
+		'no_copy': 1,
+		'oldfieldname': 'page_break',
+		'oldfieldtype': 'Check',
+		'permlevel': 0,
+		'print_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/accounts/search_criteria/budget_variance_report1/__init__.py b/buying/doctype/po_raw_material_detail/__init__.py
similarity index 100%
rename from accounts/search_criteria/budget_variance_report1/__init__.py
rename to buying/doctype/po_raw_material_detail/__init__.py
diff --git a/buying/doctype/po_raw_material_detail/po_raw_material_detail.txt b/buying/doctype/po_raw_material_detail/po_raw_material_detail.txt
new file mode 100644
index 0000000000..64b97fbc8b
--- /dev/null
+++ b/buying/doctype/po_raw_material_detail/po_raw_material_detail.txt
@@ -0,0 +1,153 @@
+# DocType, PO Raw Material Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:12',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'sneha@webnotestech.com',
+		'owner': 'dhanalekshmi@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'hide_toolbar': 1,
+		'istable': 1,
+		'module': 'Buying',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 1
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'PO Raw Material Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, PO Raw Material Detail
+	{
+		'doctype': 'DocType',
+		'name': 'PO Raw Material Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reference_name',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 1,
+		'in_filter': 0,
+		'label': 'Reference Name',
+		'oldfieldname': 'reference_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'bom_detail_no',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'BOM Detail No',
+		'oldfieldname': 'bom_detail_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'main_item_code',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Item Code',
+		'oldfieldname': 'main_item_code',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rm_item_code',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'Raw Material Item Code',
+		'oldfieldname': 'rm_item_code',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'required_qty',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'label': 'Required Qty',
+		'oldfieldname': 'required_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rate',
+		'fieldtype': 'Currency',
+		'idx': 8,
+		'label': 'Rate',
+		'oldfieldname': 'rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amount',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'label': 'Amount',
+		'oldfieldname': 'amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'conversion_factor',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 11,
+		'label': 'Conversion Factor',
+		'oldfieldname': 'conversion_factor',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_uom',
+		'fieldtype': 'Data',
+		'idx': 12,
+		'label': 'Stock Uom',
+		'oldfieldname': 'stock_uom',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/application_internal/__init__.py b/buying/doctype/pr_raw_material_detail/__init__.py
similarity index 100%
rename from application_internal/__init__.py
rename to buying/doctype/pr_raw_material_detail/__init__.py
diff --git a/buying/doctype/pr_raw_material_detail/pr_raw_material_detail.txt b/buying/doctype/pr_raw_material_detail/pr_raw_material_detail.txt
new file mode 100644
index 0000000000..fd28b85eb6
--- /dev/null
+++ b/buying/doctype/pr_raw_material_detail/pr_raw_material_detail.txt
@@ -0,0 +1,191 @@
+# DocType, PR Raw Material Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:13',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'sneha@webnotestech.com',
+		'owner': 'wasim@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'hide_toolbar': 0,
+		'istable': 1,
+		'module': 'Buying',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 17
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'PR Raw Material Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, PR Raw Material Detail
+	{
+		'doctype': 'DocType',
+		'name': 'PR Raw Material Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reference_name',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 1,
+		'in_filter': 0,
+		'label': 'Reference Name',
+		'oldfieldname': 'reference_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'bom_detail_no',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'BOM Detail No',
+		'oldfieldname': 'bom_detail_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'main_item_code',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Item Code',
+		'oldfieldname': 'main_item_code',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rm_item_code',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'Raw Material Item Code',
+		'oldfieldname': 'rm_item_code',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Data',
+		'idx': 5,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'required_qty',
+		'fieldtype': 'Currency',
+		'idx': 7,
+		'label': 'Required Qty',
+		'oldfieldname': 'required_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'consumed_qty',
+		'fieldtype': 'Currency',
+		'idx': 8,
+		'label': 'Consumed Qty',
+		'oldfieldname': 'consumed_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rate',
+		'fieldtype': 'Currency',
+		'idx': 10,
+		'label': 'Rate',
+		'oldfieldname': 'rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'conversion_factor',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 11,
+		'label': 'Conversion Factor',
+		'oldfieldname': 'conversion_factor',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amount',
+		'fieldtype': 'Currency',
+		'idx': 11,
+		'label': 'Amount',
+		'oldfieldname': 'amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_uom',
+		'fieldtype': 'Data',
+		'idx': 12,
+		'label': 'Stock Uom',
+		'oldfieldname': 'stock_uom',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'current_stock',
+		'fieldtype': 'Currency',
+		'idx': 12,
+		'label': 'Current Stock',
+		'oldfieldname': 'current_stock',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/application_internal/doctype/__init__.py b/buying/doctype/purchase_common/__init__.py
similarity index 100%
rename from application_internal/doctype/__init__.py
rename to buying/doctype/purchase_common/__init__.py
diff --git a/srm/doctype/purchase_common/purchase_common.js b/buying/doctype/purchase_common/purchase_common.js
similarity index 100%
rename from srm/doctype/purchase_common/purchase_common.js
rename to buying/doctype/purchase_common/purchase_common.js
diff --git a/srm/doctype/purchase_common/purchase_common.py b/buying/doctype/purchase_common/purchase_common.py
similarity index 99%
rename from srm/doctype/purchase_common/purchase_common.py
rename to buying/doctype/purchase_common/purchase_common.py
index cad4f1856d..d89ce2f4a0 100644
--- a/srm/doctype/purchase_common/purchase_common.py
+++ b/buying/doctype/purchase_common/purchase_common.py
@@ -36,7 +36,6 @@ class DocType:
 
 		# used in validation for items and update_prevdoc_detail
 		self.doctype_dict = {'Indent'						 : 'Indent Detail',
-							 'RFQ'								: 'RFQ Detail',
 							 'Supplier Quotation' : 'Supplier Quotation Detail',
 							 'Purchase Order'		 : 'PO Detail',
 							 'Purchase Receipt'	 : 'Purchase Receipt Detail'}
@@ -125,7 +124,7 @@ class DocType:
 		}
 		
 		# get min_order_qty from item
-		if obj.doc.doctype in ['Indent','RFQ']:
+		if obj.doc.doctype == 'Indent':
 			ret['min_order_qty'] = item and flt(item[0]['min_order_qty']) or 0
 		
 		# get projected qty from bin
diff --git a/buying/doctype/purchase_common/purchase_common.txt b/buying/doctype/purchase_common/purchase_common.txt
new file mode 100644
index 0000000000..689e42ebd3
--- /dev/null
+++ b/buying/doctype/purchase_common/purchase_common.txt
@@ -0,0 +1,31 @@
+# DocType, Purchase Common
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:15',
+		'docstatus': 0,
+		'modified': '2010-12-23 10:45:17',
+		'modified_by': 'sneha@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Buying',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 187
+	},
+
+	# DocType, Purchase Common
+	{
+		'doctype': 'DocType',
+		'name': 'Purchase Common'
+	}
+]
\ No newline at end of file
diff --git a/application_internal/doctype/code_editor/__init__.py b/buying/doctype/purchase_order/__init__.py
similarity index 100%
rename from application_internal/doctype/code_editor/__init__.py
rename to buying/doctype/purchase_order/__init__.py
diff --git a/srm/doctype/purchase_order/purchase_order.js b/buying/doctype/purchase_order/purchase_order.js
similarity index 100%
rename from srm/doctype/purchase_order/purchase_order.js
rename to buying/doctype/purchase_order/purchase_order.js
diff --git a/srm/doctype/purchase_order/purchase_order.py b/buying/doctype/purchase_order/purchase_order.py
similarity index 100%
rename from srm/doctype/purchase_order/purchase_order.py
rename to buying/doctype/purchase_order/purchase_order.py
diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt
new file mode 100644
index 0000000000..dde25fd39a
--- /dev/null
+++ b/buying/doctype/purchase_order/purchase_order.txt
@@ -0,0 +1,1123 @@
+# DocType, Purchase Order
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:15',
+		'docstatus': 0,
+		'modified': '2011-05-17 16:29:14',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1306471022',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Transaction',
+		'is_transaction_doc': 1,
+		'module': 'Buying',
+		'name': '__common__',
+		'read_only_onload': 1,
+		'search_fields': 'status, transaction_date, supplier,grand_total',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': 'To %(supplier_name)s on %(transaction_date)s | %(per_received)s% delivered',
+		'version': 494
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Purchase Order',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Purchase Order',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Purchase Order
+	{
+		'doctype': 'DocType',
+		'name': 'Purchase Order'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Purchase Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Purchase Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 0,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Purchase User',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'All'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 7,
+		'match': 'supplier',
+		'permlevel': 0,
+		'role': 'Supplier'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 8,
+		'permlevel': 2,
+		'role': 'All',
+		'write': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Enter rates and quantity of items you want to purchase and send the purchase order to your supplier.',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Basic Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 2,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'To manage multiple series please go to Setup > Manage Series',
+		'doctype': 'DocField',
+		'fieldname': 'naming_series',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Series',
+		'no_copy': 1,
+		'oldfieldname': 'naming_series',
+		'oldfieldtype': 'Select',
+		'options': '\nPO',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Supplier (vendor) name as entered in supplier master',
+		'doctype': 'DocField',
+		'fieldname': 'supplier',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Supplier',
+		'oldfieldname': 'supplier',
+		'oldfieldtype': 'Link',
+		'options': 'Supplier',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'supplier_address',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Supplier Address',
+		'options': 'Address',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_person',
+		'fieldtype': 'Link',
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Contact Person',
+		'options': 'Contact',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'supplier_name',
+		'fieldtype': 'Data',
+		'idx': 7,
+		'label': 'Name',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'address_display',
+		'fieldtype': 'Small Text',
+		'idx': 8,
+		'label': 'Address',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_display',
+		'fieldtype': 'Small Text',
+		'idx': 9,
+		'label': 'Contact',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_mobile',
+		'fieldtype': 'Text',
+		'idx': 10,
+		'label': 'Mobile No',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_email',
+		'fieldtype': 'Text',
+		'idx': 11,
+		'label': 'Contact Email',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 12,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'print_hide': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'The date at which current entry is made in system.',
+		'doctype': 'DocField',
+		'fieldname': 'transaction_date',
+		'fieldtype': 'Date',
+		'idx': 13,
+		'in_filter': 1,
+		'label': 'Purchase Order Date',
+		'oldfieldname': 'transaction_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Select',
+		'idx': 14,
+		'in_filter': 1,
+		'label': 'Status',
+		'no_copy': 1,
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Select',
+		'options': '\nDraft\nSubmitted\nStopped\nCancelled',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Track this Purchase Order against any Project',
+		'doctype': 'DocField',
+		'fieldname': 'project_name',
+		'fieldtype': 'Link',
+		'idx': 15,
+		'in_filter': 1,
+		'label': 'Project Name',
+		'oldfieldname': 'project_name',
+		'oldfieldtype': 'Link',
+		'options': 'Project',
+		'permlevel': 0,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.__islocal',
+		'description': '% of materials received against this Purchase Order',
+		'doctype': 'DocField',
+		'fieldname': 'per_received',
+		'fieldtype': 'Currency',
+		'idx': 16,
+		'label': '% Received',
+		'no_copy': 1,
+		'oldfieldname': 'per_received',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.__islocal',
+		'description': '% of materials billed against this Purchase Order.',
+		'doctype': 'DocField',
+		'fieldname': 'per_billed',
+		'fieldtype': 'Currency',
+		'idx': 17,
+		'label': '% Billed',
+		'no_copy': 1,
+		'oldfieldname': 'per_billed',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 18,
+		'label': 'Items',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'You can make a purchase order from multiple indents. Select indents one by one and click on the button below.',
+		'doctype': 'DocField',
+		'fieldname': 'indent_no',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 19,
+		'label': 'Select Indent',
+		'no_copy': 1,
+		'oldfieldname': 'indent_no',
+		'oldfieldtype': 'Link',
+		'options': 'Indent',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'hidden': 0,
+		'idx': 20,
+		'label': 'Get Items',
+		'oldfieldtype': 'Button',
+		'options': 'get_indent_details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_subcontracted',
+		'fieldtype': 'Select',
+		'idx': 21,
+		'label': 'Is Subcontracted',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 22,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': "Supplier's currency",
+		'doctype': 'DocField',
+		'fieldname': 'currency',
+		'fieldtype': 'Select',
+		'idx': 23,
+		'label': 'Currency',
+		'no_copy': 0,
+		'oldfieldname': 'currency',
+		'oldfieldtype': 'Select',
+		'options': 'link:Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': '1',
+		'description': "Rate at which supplier's currency is converted to your currency",
+		'doctype': 'DocField',
+		'fieldname': 'conversion_rate',
+		'fieldtype': 'Currency',
+		'hidden': 0,
+		'idx': 24,
+		'label': 'Conversion Rate',
+		'no_copy': 1,
+		'oldfieldname': 'conversion_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 25,
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'po_details',
+		'fieldtype': 'Table',
+		'idx': 26,
+		'label': 'PO Details',
+		'no_copy': 0,
+		'oldfieldname': 'po_details',
+		'oldfieldtype': 'Table',
+		'options': 'PO Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 27,
+		'label': 'Get Last Purchase Rate',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'print_hide': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'net_total',
+		'fieldtype': 'Currency',
+		'idx': 28,
+		'label': 'Net Total*',
+		'no_copy': 1,
+		'oldfieldname': 'net_total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 29,
+		'label': 'Re-Calculate Values',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 30,
+		'label': 'Note HTML',
+		'options': '
Note : * In Base Currency\n
',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 31,
+		'label': 'Taxes',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'If you have created a standard template in Other Charges master, select one and click on the button below.',
+		'doctype': 'DocField',
+		'fieldname': 'purchase_other_charges',
+		'fieldtype': 'Link',
+		'idx': 32,
+		'label': 'Purchase Other Charges',
+		'no_copy': 1,
+		'oldfieldname': 'purchase_other_charges',
+		'oldfieldtype': 'Link',
+		'options': 'Purchase Other Charges',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 33,
+		'label': 'Get Tax Detail',
+		'oldfieldtype': 'Button',
+		'options': 'get_purchase_tax_details',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'purchase_tax_details',
+		'fieldtype': 'Table',
+		'idx': 34,
+		'label': 'Purchase Tax Details',
+		'no_copy': 0,
+		'oldfieldname': 'purchase_tax_details',
+		'oldfieldtype': 'Table',
+		'options': 'Purchase Tax Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 35,
+		'label': 'Calculate Tax',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 36,
+		'label': 'Tax Calculation',
+		'no_copy': 1,
+		'oldfieldtype': 'HTML',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'total_tax',
+		'fieldtype': 'Currency',
+		'idx': 37,
+		'label': 'Total Tax*',
+		'no_copy': 1,
+		'oldfieldname': 'total_tax',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 38,
+		'label': 'Note HTML',
+		'options': '
Note : * In Base Currency\n
',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 39,
+		'label': 'Totals',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'grand_total',
+		'fieldtype': 'Currency',
+		'idx': 40,
+		'label': 'Grand Total',
+		'no_copy': 1,
+		'oldfieldname': 'grand_total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rounded_total',
+		'fieldtype': 'Currency',
+		'idx': 41,
+		'label': 'Rounded Total',
+		'oldfieldname': 'rounded_total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'In Words will be visible once you save the Purchase Order.',
+		'doctype': 'DocField',
+		'fieldname': 'in_words',
+		'fieldtype': 'Data',
+		'idx': 42,
+		'label': 'In Words',
+		'oldfieldname': 'in_words',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'other_charges_added',
+		'fieldtype': 'Currency',
+		'idx': 43,
+		'label': 'Other Charges Added',
+		'no_copy': 0,
+		'oldfieldname': 'other_charges_added',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'other_charges_deducted',
+		'fieldtype': 'Currency',
+		'idx': 44,
+		'label': 'Other Charges Deducted',
+		'no_copy': 0,
+		'oldfieldname': 'other_charges_deducted',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 45,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'net_total_import',
+		'fieldtype': 'Currency',
+		'idx': 46,
+		'label': 'Net Total (Import)',
+		'no_copy': 0,
+		'oldfieldname': 'net_total_import',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'grand_total_import',
+		'fieldtype': 'Currency',
+		'idx': 47,
+		'label': 'Grand Total (Import)',
+		'no_copy': 0,
+		'oldfieldname': 'grand_total_import',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'In Words(Import) will be visible once you save the Purchase Order.',
+		'doctype': 'DocField',
+		'fieldname': 'in_words_import',
+		'fieldtype': 'Data',
+		'idx': 48,
+		'label': 'In Words(Import)',
+		'oldfieldname': 'in_words_import',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'other_charges_added_import',
+		'fieldtype': 'Currency',
+		'idx': 49,
+		'label': 'Other Charges Added (Import)',
+		'no_copy': 0,
+		'oldfieldname': 'other_charges_added_import',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'other_charges_deducted_import',
+		'fieldtype': 'Currency',
+		'idx': 50,
+		'label': 'Other Charges Deducted (Import)',
+		'no_copy': 0,
+		'oldfieldname': 'other_charges_deducted_import',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 51,
+		'label': 'Terms',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'letter_head',
+		'fieldtype': 'Select',
+		'idx': 52,
+		'label': 'Letter Head',
+		'oldfieldname': 'letter_head',
+		'oldfieldtype': 'Select',
+		'options': 'link:Letter Head',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tc_name',
+		'fieldtype': 'Link',
+		'idx': 53,
+		'label': 'Select Terms',
+		'oldfieldname': 'tc_name',
+		'oldfieldtype': 'Link',
+		'options': 'Term',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 54,
+		'label': 'Get Terms',
+		'oldfieldtype': 'Button',
+		'options': 'get_tc_details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 55,
+		'label': 'Terms HTML',
+		'oldfieldtype': 'HTML',
+		'options': 'You can add Terms and Notes that will be printed in the Transaction',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'terms',
+		'fieldtype': 'Text Editor',
+		'idx': 56,
+		'label': 'Terms1',
+		'oldfieldname': 'terms',
+		'oldfieldtype': 'Text Editor',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 57,
+		'label': 'More Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'ref_sq',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 58,
+		'label': 'Ref SQ',
+		'no_copy': 1,
+		'oldfieldname': 'ref_sq',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 59,
+		'label': 'Amended From',
+		'no_copy': 1,
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 0
+	},
+
+	# DocField
+	{
+		'description': 'The date at which current entry is corrected in the system.',
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'hidden': 0,
+		'idx': 60,
+		'label': 'Amendment Date',
+		'no_copy': 1,
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Select the relevant company name if you have multiple companies',
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 61,
+		'in_filter': 1,
+		'label': 'Company',
+		'no_copy': 0,
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 62,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'no_copy': 0,
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'select_print_heading',
+		'fieldtype': 'Link',
+		'idx': 63,
+		'label': 'Select Print Heading',
+		'no_copy': 1,
+		'oldfieldname': 'select_print_heading',
+		'oldfieldtype': 'Link',
+		'options': 'Print Heading',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'instructions',
+		'fieldtype': 'Text',
+		'idx': 64,
+		'label': 'Instructions',
+		'oldfieldname': 'instructions',
+		'oldfieldtype': 'Text',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 65,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'payment_terms',
+		'fieldtype': 'Text',
+		'idx': 66,
+		'label': 'Payment Terms',
+		'no_copy': 1,
+		'oldfieldname': 'payment_terms',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'remarks',
+		'fieldtype': 'Text',
+		'idx': 67,
+		'label': 'Remarks',
+		'no_copy': 1,
+		'oldfieldname': 'remarks',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.__islocal',
+		'doctype': 'DocField',
+		'fieldname': 'cancel_reason',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 68,
+		'label': 'Cancel Reason',
+		'no_copy': 1,
+		'oldfieldname': 'cancel_reason',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Required raw materials issued to the supplier for producing a sub - contracted item.',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 69,
+		'label': 'Raw Material Details',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'po_raw_material_details',
+		'fieldtype': 'Table',
+		'idx': 70,
+		'label': 'PO Raw Material Details',
+		'no_copy': 0,
+		'oldfieldname': 'po_raw_material_details',
+		'oldfieldtype': 'Table',
+		'options': 'PO Raw Material Detail',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 71,
+		'label': 'Repair Purchase Order',
+		'oldfieldtype': 'Button',
+		'options': 'repair_purchase_order',
+		'permlevel': 0,
+		'print_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/application_internal/doctype/code_history/__init__.py b/buying/doctype/purchase_other_charges/__init__.py
similarity index 100%
rename from application_internal/doctype/code_history/__init__.py
rename to buying/doctype/purchase_other_charges/__init__.py
diff --git a/srm/doctype/purchase_other_charges/purchase_other_charges.js b/buying/doctype/purchase_other_charges/purchase_other_charges.js
similarity index 100%
rename from srm/doctype/purchase_other_charges/purchase_other_charges.js
rename to buying/doctype/purchase_other_charges/purchase_other_charges.js
diff --git a/srm/doctype/purchase_other_charges/purchase_other_charges.py b/buying/doctype/purchase_other_charges/purchase_other_charges.py
similarity index 100%
rename from srm/doctype/purchase_other_charges/purchase_other_charges.py
rename to buying/doctype/purchase_other_charges/purchase_other_charges.py
diff --git a/buying/doctype/purchase_other_charges/purchase_other_charges.txt b/buying/doctype/purchase_other_charges/purchase_other_charges.txt
new file mode 100644
index 0000000000..5c5503944c
--- /dev/null
+++ b/buying/doctype/purchase_other_charges/purchase_other_charges.txt
@@ -0,0 +1,123 @@
+# DocType, Purchase Other Charges
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:15',
+		'docstatus': 0,
+		'modified': '2010-09-20 17:30:25',
+		'modified_by': 'Administrator',
+		'owner': 'wasim@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:title',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Buying',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 16
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Purchase Other Charges',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Purchase Other Charges',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Purchase Other Charges
+	{
+		'doctype': 'DocType',
+		'name': 'Purchase Other Charges'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'All'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Purchase Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Purchase Master Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'title',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'in_filter': 1,
+		'label': 'Title',
+		'oldfieldname': 'title',
+		'oldfieldtype': 'Data',
+		'reqd': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'purchase_tax_details',
+		'fieldtype': 'Table',
+		'idx': 2,
+		'label': 'Purchase Tax Details',
+		'oldfieldname': 'purchase_tax_details',
+		'oldfieldtype': 'Table',
+		'options': 'Purchase Tax Detail'
+	}
+]
\ No newline at end of file
diff --git a/application_internal/doctype/doctype_label/__init__.py b/buying/doctype/qa_inspection_report/__init__.py
similarity index 100%
rename from application_internal/doctype/doctype_label/__init__.py
rename to buying/doctype/qa_inspection_report/__init__.py
diff --git a/srm/doctype/qa_inspection_report/qa_inspection_report.js b/buying/doctype/qa_inspection_report/qa_inspection_report.js
similarity index 100%
rename from srm/doctype/qa_inspection_report/qa_inspection_report.js
rename to buying/doctype/qa_inspection_report/qa_inspection_report.js
diff --git a/srm/doctype/qa_inspection_report/qa_inspection_report.py b/buying/doctype/qa_inspection_report/qa_inspection_report.py
similarity index 100%
rename from srm/doctype/qa_inspection_report/qa_inspection_report.py
rename to buying/doctype/qa_inspection_report/qa_inspection_report.py
diff --git a/buying/doctype/qa_inspection_report/qa_inspection_report.txt b/buying/doctype/qa_inspection_report/qa_inspection_report.txt
new file mode 100644
index 0000000000..5febdec44e
--- /dev/null
+++ b/buying/doctype/qa_inspection_report/qa_inspection_report.txt
@@ -0,0 +1,359 @@
+# DocType, QA Inspection Report
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:17',
+		'docstatus': 0,
+		'modified': '2011-04-08 10:53:33',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'Buying',
+		'name': '__common__',
+		'print_outline': 'Yes',
+		'search_fields': 'item_code, report_date, purchase_receipt_no, delivery_note_no',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 37
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'QA Inspection Report',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'QA Inspection Report',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'role': 'Quality Manager'
+	},
+
+	# DocType, QA Inspection Report
+	{
+		'doctype': 'DocType',
+		'name': 'QA Inspection Report'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'QA Inspection',
+		'no_copy': 0,
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 2,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'naming_series',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Naming Series',
+		'no_copy': 1,
+		'options': '\nQAI/11-12/',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'inspection_type',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Inspection Type',
+		'oldfieldname': 'inspection_type',
+		'oldfieldtype': 'Select',
+		'options': '\nIncoming\nOutgoing\nIn Process',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'report_date',
+		'fieldtype': 'Date',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Report Date',
+		'oldfieldname': 'report_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sample_size',
+		'fieldtype': 'Currency',
+		'idx': 7,
+		'in_filter': 0,
+		'label': 'Sample Size',
+		'oldfieldname': 'sample_size',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Small Text',
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'search_index': 0,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 9,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_serial_no',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 10,
+		'label': 'Item Serial No',
+		'oldfieldname': 'item_serial_no',
+		'oldfieldtype': 'Link',
+		'options': 'Serial No',
+		'permlevel': 0,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'batch_no',
+		'fieldtype': 'Link',
+		'idx': 11,
+		'label': 'Batch No',
+		'oldfieldname': 'batch_no',
+		'oldfieldtype': 'Link',
+		'options': 'Batch',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'purchase_receipt_no',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 12,
+		'in_filter': 1,
+		'label': 'Purchase Receipt No',
+		'oldfieldname': 'purchase_receipt_no',
+		'oldfieldtype': 'Link',
+		'options': 'Purchase Receipt',
+		'permlevel': 0,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'delivery_note_no',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 13,
+		'in_filter': 1,
+		'label': 'Delivery Note No',
+		'oldfieldname': 'delivery_note_no',
+		'oldfieldtype': 'Link',
+		'options': 'Delivery Note',
+		'permlevel': 0,
+		'print_hide': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'inspected_by',
+		'fieldtype': 'Data',
+		'idx': 14,
+		'label': 'Inspected By',
+		'oldfieldname': 'inspected_by',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'remarks',
+		'fieldtype': 'Text',
+		'idx': 15,
+		'label': 'Remarks',
+		'no_copy': 1,
+		'oldfieldname': 'remarks',
+		'oldfieldtype': 'Text',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'verified_by',
+		'fieldtype': 'Data',
+		'idx': 16,
+		'label': 'Verified By',
+		'oldfieldname': 'verified_by',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'idx': 17,
+		'label': 'Amended From',
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'idx': 18,
+		'label': 'Amendment Date',
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 19,
+		'label': 'Specification Details',
+		'oldfieldtype': 'Section Break',
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 20,
+		'label': 'Get Specification Details',
+		'oldfieldtype': 'Button',
+		'options': 'get_item_specification_details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'qa_specification_details',
+		'fieldtype': 'Table',
+		'idx': 21,
+		'label': 'QA Specification Details',
+		'oldfieldname': 'qa_specification_details',
+		'oldfieldtype': 'Table',
+		'options': 'QA Specification Detail',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/application_internal/doctype/doctype_property_setter/__init__.py b/buying/doctype/qa_specification_detail/__init__.py
similarity index 100%
rename from application_internal/doctype/doctype_property_setter/__init__.py
rename to buying/doctype/qa_specification_detail/__init__.py
diff --git a/buying/doctype/qa_specification_detail/qa_specification_detail.txt b/buying/doctype/qa_specification_detail/qa_specification_detail.txt
new file mode 100644
index 0000000000..07ccb03261
--- /dev/null
+++ b/buying/doctype/qa_specification_detail/qa_specification_detail.txt
@@ -0,0 +1,188 @@
+# DocType, QA Specification Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:17',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'QASD/.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Buying',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 2
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'QA Specification Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, QA Specification Detail
+	{
+		'doctype': 'DocType',
+		'name': 'QA Specification Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'specification',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Parameter',
+		'oldfieldname': 'specification',
+		'oldfieldtype': 'Data',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'value',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Acceptance Criteria',
+		'oldfieldname': 'value',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reading_1',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Reading 1',
+		'oldfieldname': 'reading_1',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reading_2',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'Reading 2',
+		'oldfieldname': 'reading_2',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reading_3',
+		'fieldtype': 'Data',
+		'idx': 5,
+		'label': 'Reading 3',
+		'oldfieldname': 'reading_3',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reading_4',
+		'fieldtype': 'Data',
+		'idx': 6,
+		'label': 'Reading 4',
+		'oldfieldname': 'reading_4',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reading_5',
+		'fieldtype': 'Data',
+		'idx': 7,
+		'label': 'Reading 5',
+		'oldfieldname': 'reading_5',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reading_6',
+		'fieldtype': 'Data',
+		'idx': 8,
+		'label': 'Reading 6',
+		'oldfieldname': 'reading_6',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reading_7',
+		'fieldtype': 'Data',
+		'idx': 9,
+		'label': 'Reading 7',
+		'oldfieldname': 'reading_7',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reading_8',
+		'fieldtype': 'Data',
+		'idx': 10,
+		'label': 'Reading 8',
+		'oldfieldname': 'reading_8',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reading_9',
+		'fieldtype': 'Data',
+		'idx': 11,
+		'label': 'Reading 9',
+		'oldfieldname': 'reading_9',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reading_10',
+		'fieldtype': 'Data',
+		'idx': 12,
+		'label': 'Reading 10',
+		'oldfieldname': 'reading_10',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'default': 'Accepted',
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Select',
+		'idx': 13,
+		'label': 'Status',
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Select',
+		'options': 'Accepted\nRejected'
+	}
+]
\ No newline at end of file
diff --git a/application_internal/doctype/documentation/__init__.py b/buying/doctype/raw_materials_supplied/__init__.py
similarity index 100%
rename from application_internal/doctype/documentation/__init__.py
rename to buying/doctype/raw_materials_supplied/__init__.py
diff --git a/buying/doctype/raw_materials_supplied/raw_materials_supplied.txt b/buying/doctype/raw_materials_supplied/raw_materials_supplied.txt
new file mode 100644
index 0000000000..23dd235878
--- /dev/null
+++ b/buying/doctype/raw_materials_supplied/raw_materials_supplied.txt
@@ -0,0 +1,148 @@
+# DocType, Raw Materials Supplied
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:18',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'RMS/.######',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Buying',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'show_in_menu': 0,
+		'version': 8
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Raw Materials Supplied',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Raw Materials Supplied
+	{
+		'doctype': 'DocType',
+		'name': 'Raw Materials Supplied'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'po_item',
+		'fieldtype': 'Select',
+		'idx': 1,
+		'label': 'PO Item',
+		'oldfieldname': 'po_item',
+		'oldfieldtype': 'Select',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'raw_material',
+		'fieldtype': 'Link',
+		'idx': 2,
+		'label': 'Raw Material',
+		'oldfieldname': 'raw_material',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Small Text',
+		'idx': 3,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'source_warehouse',
+		'fieldtype': 'Select',
+		'idx': 5,
+		'label': 'Source Warehouse',
+		'oldfieldname': 'source_warehouse',
+		'oldfieldtype': 'Select',
+		'options': 'link:Warehouse',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'ma_valuation_rate',
+		'fieldtype': 'Currency',
+		'idx': 7,
+		'label': 'Valuation  Rate (MA)',
+		'no_copy': 1,
+		'oldfieldname': 'ma_valuation_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fifo_valuation_rate',
+		'fieldtype': 'Currency',
+		'idx': 8,
+		'label': 'Valuation Rate (FIFO)',
+		'oldfieldname': 'fifo_valuation_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'qty',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'label': 'Qty',
+		'oldfieldname': 'qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_uom',
+		'fieldtype': 'Data',
+		'idx': 12,
+		'label': 'Stock UOM',
+		'oldfieldname': 'stock_uom',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/application_internal/doctype/form_settings/__init__.py b/buying/doctype/supplier/__init__.py
similarity index 100%
rename from application_internal/doctype/form_settings/__init__.py
rename to buying/doctype/supplier/__init__.py
diff --git a/srm/doctype/supplier/supplier.js b/buying/doctype/supplier/supplier.js
similarity index 100%
rename from srm/doctype/supplier/supplier.js
rename to buying/doctype/supplier/supplier.js
diff --git a/srm/doctype/supplier/supplier.py b/buying/doctype/supplier/supplier.py
similarity index 100%
rename from srm/doctype/supplier/supplier.py
rename to buying/doctype/supplier/supplier.py
diff --git a/buying/doctype/supplier/supplier.txt b/buying/doctype/supplier/supplier.txt
new file mode 100644
index 0000000000..b7797e548f
--- /dev/null
+++ b/buying/doctype/supplier/supplier.txt
@@ -0,0 +1,349 @@
+# DocType, Supplier
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:26',
+		'docstatus': 0,
+		'modified': '2011-05-10 17:42:21',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1306471021',
+		'allow_trash': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Buying',
+		'name': '__common__',
+		'search_fields': 'supplier_name,supplier_type',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': ' ',
+		'tag_fields': 'supplier_type',
+		'version': 86
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Supplier',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Supplier',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Supplier
+	{
+		'doctype': 'DocType',
+		'name': 'Supplier'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Purchase Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Purchase Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Purchase Master Manager'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Purchase Master Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Note: You Can Manage Multiple Address or Contacts via Addresses & Contacts',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Basic Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'supplier_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Supplier Name',
+		'no_copy': 1,
+		'oldfieldname': 'supplier_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'supplier_type',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'label': 'Supplier Type',
+		'oldfieldname': 'supplier_type',
+		'oldfieldtype': 'Link',
+		'options': 'Supplier Type',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 4,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'naming_series',
+		'fieldtype': 'Select',
+		'idx': 5,
+		'label': 'Series',
+		'no_copy': 1,
+		'oldfieldname': 'naming_series',
+		'oldfieldtype': 'Select',
+		'options': '\nSUPP\nSUPP/10-11/',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'supplier_status',
+		'fieldtype': 'Select',
+		'idx': 6,
+		'label': 'Supplier Status',
+		'oldfieldname': 'supplier_status',
+		'oldfieldtype': 'Select',
+		'options': '\nApproved\nUnapproved',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 7,
+		'label': 'Address & Contacts',
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:doc.__islocal',
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 8,
+		'label': 'Address Desc',
+		'options': 'Addresses will appear only when you save the supplier',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 9,
+		'label': 'Address HTML',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 10,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:doc.__islocal',
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 11,
+		'label': 'Contact Desc',
+		'options': 'Contact Details will appear only when you save the supplier',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 12,
+		'label': 'Contact HTML',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 13,
+		'label': 'More Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Enter the company name under which Account Head will be created for this Supplier',
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 14,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Statutory info and other general information about your Supplier',
+		'doctype': 'DocField',
+		'fieldname': 'supplier_details',
+		'fieldtype': 'Text',
+		'idx': 15,
+		'label': 'Supplier Details',
+		'oldfieldname': 'supplier_details',
+		'oldfieldtype': 'Code',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 16,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'credit_days',
+		'fieldtype': 'Int',
+		'idx': 17,
+		'label': 'Credit Days',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'website',
+		'fieldtype': 'Data',
+		'idx': 18,
+		'label': 'Website',
+		'oldfieldname': 'website',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.__islocal',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 19,
+		'label': 'Transaction History',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.__islocal',
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 20,
+		'label': 'History HTML',
+		'oldfieldtype': 'HTML',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 21,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/application_internal/doctype/gl_mapper/__init__.py b/buying/doctype/supplier_quotation/__init__.py
old mode 100644
new mode 100755
similarity index 100%
rename from application_internal/doctype/gl_mapper/__init__.py
rename to buying/doctype/supplier_quotation/__init__.py
diff --git a/srm/doctype/supplier_quotation/supplier_quotation.js b/buying/doctype/supplier_quotation/supplier_quotation.js
similarity index 100%
rename from srm/doctype/supplier_quotation/supplier_quotation.js
rename to buying/doctype/supplier_quotation/supplier_quotation.js
diff --git a/srm/doctype/supplier_quotation/supplier_quotation.py b/buying/doctype/supplier_quotation/supplier_quotation.py
similarity index 100%
rename from srm/doctype/supplier_quotation/supplier_quotation.py
rename to buying/doctype/supplier_quotation/supplier_quotation.py
diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/buying/doctype/supplier_quotation/supplier_quotation.txt
new file mode 100755
index 0000000000..129724641a
--- /dev/null
+++ b/buying/doctype/supplier_quotation/supplier_quotation.txt
@@ -0,0 +1,607 @@
+# DocType, Supplier Quotation
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-10-27 12:55:42',
+		'docstatus': 0,
+		'modified': '2011-01-28 11:41:36',
+		'modified_by': 'rakesh@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'SQ.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 1,
+		'module': 'Buying',
+		'name': '__common__',
+		'read_only': 1,
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 241
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Supplier Quotation',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Supplier Quotation',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Supplier Quotation
+	{
+		'doctype': 'DocType',
+		'name': 'Supplier Quotation'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Supplier',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'Purchase User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Purchase Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 1,
+		'role': 'All'
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 2,
+		'role': 'Purchase User',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'doctype': 'DocPerm',
+		'idx': 7,
+		'permlevel': 2,
+		'role': 'Purchase Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 1,
+		'label': 'Create PO',
+		'oldfieldtype': 'Button',
+		'permlevel': 2,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Enter item rates and details of supplier who is providing quotation',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 2,
+		'label': 'Basic Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 3,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'naming_series',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Series',
+		'no_copy': 1,
+		'oldfieldname': 'naming_series',
+		'oldfieldtype': 'Select',
+		'options': '\nSQTN',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Draft',
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Select',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Status',
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Select',
+		'options': '\nDraft\nQuotation Sent\nOrder Confirmed\nCancelled',
+		'permlevel': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'default': 'Today',
+		'description': 'The date at which current entry is made in system.',
+		'doctype': 'DocField',
+		'fieldname': 'transaction_date',
+		'fieldtype': 'Date',
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Quotation Date',
+		'oldfieldname': 'transaction_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'activity_log_text',
+		'fieldtype': 'Text',
+		'idx': 7,
+		'label': 'Activity Log Text',
+		'oldfieldname': 'activity_log_text',
+		'oldfieldtype': 'Text',
+		'permlevel': 2
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'For Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 9,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 10,
+		'label': 'Amended From',
+		'no_copy': 1,
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'hidden': 1,
+		'idx': 11,
+		'label': 'Amendment Date',
+		'no_copy': 1,
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 12,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 0,
+		'description': 'You can create PO when quotation gets approved.',
+		'doctype': 'DocField',
+		'fieldname': 'approval_status',
+		'fieldtype': 'Select',
+		'idx': 13,
+		'label': 'Approval Status',
+		'oldfieldname': 'approval_status',
+		'oldfieldtype': 'Select',
+		'options': '\nApproved\nNot Approved',
+		'permlevel': 2
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 14,
+		'label': 'Approve / Unapprove',
+		'oldfieldtype': 'Button',
+		'permlevel': 2,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'supplier',
+		'fieldtype': 'Link',
+		'idx': 15,
+		'in_filter': 1,
+		'label': 'Supplier',
+		'oldfieldname': 'supplier',
+		'oldfieldtype': 'Link',
+		'options': 'Supplier',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'supplier_name',
+		'fieldtype': 'Data',
+		'idx': 16,
+		'in_filter': 1,
+		'label': 'Supplier Name',
+		'oldfieldname': 'supplier_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'supplier_address',
+		'fieldtype': 'Text',
+		'idx': 17,
+		'label': 'Supplier Address',
+		'oldfieldname': 'supplier_address',
+		'oldfieldtype': 'Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'contact_person',
+		'fieldtype': 'Link',
+		'idx': 18,
+		'in_filter': 0,
+		'label': 'Contact Person',
+		'oldfieldname': 'contact_person',
+		'oldfieldtype': 'Link',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_no',
+		'fieldtype': 'Data',
+		'idx': 19,
+		'label': 'Contact No',
+		'oldfieldname': 'contact_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'email',
+		'fieldtype': 'Data',
+		'idx': 20,
+		'label': 'Email',
+		'oldfieldname': 'email',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 21,
+		'label': 'Item Details',
+		'oldfieldtype': 'Section Break',
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rfq_no',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 22,
+		'label': 'RFQ No',
+		'oldfieldname': 'rfq_no',
+		'oldfieldtype': 'Link',
+		'options': 'RFQ',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 23,
+		'label': 'Get Items',
+		'oldfieldtype': 'Button',
+		'options': 'get_rfq_details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 24,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': "Supplier's currency",
+		'doctype': 'DocField',
+		'fieldname': 'currency',
+		'fieldtype': 'Select',
+		'idx': 25,
+		'label': 'Currency',
+		'oldfieldname': 'currency',
+		'oldfieldtype': 'Select',
+		'options': 'link:Currency',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': '1',
+		'description': "Rate at which supplier's currency is converted to your currency",
+		'doctype': 'DocField',
+		'fieldname': 'conversion_rate',
+		'fieldtype': 'Currency',
+		'idx': 26,
+		'label': 'Conversion Rate',
+		'no_copy': 1,
+		'oldfieldname': 'conversion_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 27,
+		'oldfieldtype': 'Section Break',
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'supplier_quotation_details',
+		'fieldtype': 'Table',
+		'idx': 28,
+		'label': 'Quotation Details1',
+		'oldfieldname': 'supplier_quotation_details',
+		'oldfieldtype': 'Table',
+		'options': 'Supplier Quotation Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'net_total',
+		'fieldtype': 'Currency',
+		'idx': 29,
+		'label': 'Net Total',
+		'oldfieldname': 'net_total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Enter terms and conditions which you want to include',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 30,
+		'label': 'Terms',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tc_name',
+		'fieldtype': 'Link',
+		'idx': 31,
+		'label': 'Select Terms',
+		'oldfieldname': 'tc_name',
+		'oldfieldtype': 'Link',
+		'options': 'Term',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 32,
+		'label': 'Get Terms',
+		'oldfieldtype': 'Button',
+		'options': 'get_tc_details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 33,
+		'label': 'Terms HTML',
+		'oldfieldtype': 'HTML',
+		'options': 'You can add Terms and Notes that will be printed in the Transaction',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'terms',
+		'fieldtype': 'Text Editor',
+		'idx': 34,
+		'label': 'Terms and Conditions',
+		'oldfieldname': 'terms',
+		'oldfieldtype': 'Text Editor',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': "Next steps will be visible when you submit the supplier quotation and approval status is 'Approved'",
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 35,
+		'label': 'Next Steps',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 36,
+		'label': 'Get Report',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	}
+]
\ No newline at end of file
diff --git a/application_internal/doctype/gl_mapper_detail/__init__.py b/buying/page/__init__.py
similarity index 100%
rename from application_internal/doctype/gl_mapper_detail/__init__.py
rename to buying/page/__init__.py
diff --git a/application_internal/doctype/impact_analysis/__init__.py b/buying/search_criteria/__init__.py
similarity index 100%
rename from application_internal/doctype/impact_analysis/__init__.py
rename to buying/search_criteria/__init__.py
diff --git a/application_internal/doctype/mail/__init__.py b/buying/search_criteria/itemwise_purchase_details/__init__.py
similarity index 100%
rename from application_internal/doctype/mail/__init__.py
rename to buying/search_criteria/itemwise_purchase_details/__init__.py
diff --git a/srm/search_criteria/itemwise_purchase_details/itemwise_purchase_details.js b/buying/search_criteria/itemwise_purchase_details/itemwise_purchase_details.js
similarity index 100%
rename from srm/search_criteria/itemwise_purchase_details/itemwise_purchase_details.js
rename to buying/search_criteria/itemwise_purchase_details/itemwise_purchase_details.js
diff --git a/srm/search_criteria/itemwise_purchase_details/itemwise_purchase_details.txt b/buying/search_criteria/itemwise_purchase_details/itemwise_purchase_details.txt
similarity index 100%
rename from srm/search_criteria/itemwise_purchase_details/itemwise_purchase_details.txt
rename to buying/search_criteria/itemwise_purchase_details/itemwise_purchase_details.txt
diff --git a/application_internal/doctype/mail_participant_details/__init__.py b/buying/search_criteria/itemwise_receipt_details/__init__.py
similarity index 100%
rename from application_internal/doctype/mail_participant_details/__init__.py
rename to buying/search_criteria/itemwise_receipt_details/__init__.py
diff --git a/srm/search_criteria/itemwise_receipt_details/itemwise_receipt_details.js b/buying/search_criteria/itemwise_receipt_details/itemwise_receipt_details.js
similarity index 100%
rename from srm/search_criteria/itemwise_receipt_details/itemwise_receipt_details.js
rename to buying/search_criteria/itemwise_receipt_details/itemwise_receipt_details.js
diff --git a/srm/search_criteria/itemwise_receipt_details/itemwise_receipt_details.txt b/buying/search_criteria/itemwise_receipt_details/itemwise_receipt_details.txt
similarity index 100%
rename from srm/search_criteria/itemwise_receipt_details/itemwise_receipt_details.txt
rename to buying/search_criteria/itemwise_receipt_details/itemwise_receipt_details.txt
diff --git a/application_internal/doctype/menu_control/__init__.py b/buying/search_criteria/pending_po_items_to_bill/__init__.py
similarity index 100%
rename from application_internal/doctype/menu_control/__init__.py
rename to buying/search_criteria/pending_po_items_to_bill/__init__.py
diff --git a/srm/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.js b/buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.js
similarity index 100%
rename from srm/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.js
rename to buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.js
diff --git a/srm/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt b/buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt
similarity index 100%
rename from srm/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt
rename to buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt
diff --git a/application_internal/doctype/message/__init__.py b/buying/search_criteria/pending_po_items_to_receive/__init__.py
similarity index 100%
rename from application_internal/doctype/message/__init__.py
rename to buying/search_criteria/pending_po_items_to_receive/__init__.py
diff --git a/srm/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.js b/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.js
similarity index 100%
rename from srm/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.js
rename to buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.js
diff --git a/srm/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.py b/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.py
similarity index 100%
rename from srm/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.py
rename to buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.py
diff --git a/srm/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt b/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt
similarity index 100%
rename from srm/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt
rename to buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt
diff --git a/application_internal/doctype/message_control/__init__.py b/buying/search_criteria/purchase_in_transit/__init__.py
similarity index 100%
rename from application_internal/doctype/message_control/__init__.py
rename to buying/search_criteria/purchase_in_transit/__init__.py
diff --git a/srm/search_criteria/purchase_in_transit/purchase_in_transit.js b/buying/search_criteria/purchase_in_transit/purchase_in_transit.js
similarity index 100%
rename from srm/search_criteria/purchase_in_transit/purchase_in_transit.js
rename to buying/search_criteria/purchase_in_transit/purchase_in_transit.js
diff --git a/srm/search_criteria/purchase_in_transit/purchase_in_transit.py b/buying/search_criteria/purchase_in_transit/purchase_in_transit.py
similarity index 100%
rename from srm/search_criteria/purchase_in_transit/purchase_in_transit.py
rename to buying/search_criteria/purchase_in_transit/purchase_in_transit.py
diff --git a/srm/search_criteria/purchase_in_transit/purchase_in_transit.txt b/buying/search_criteria/purchase_in_transit/purchase_in_transit.txt
similarity index 100%
rename from srm/search_criteria/purchase_in_transit/purchase_in_transit.txt
rename to buying/search_criteria/purchase_in_transit/purchase_in_transit.txt
diff --git a/crm/doctype/campaign/campaign.txt b/crm/doctype/campaign/campaign.txt
deleted file mode 100644
index 7d2817db37..0000000000
--- a/crm/doctype/campaign/campaign.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-11-24 14:43:37', 'search_fields': None, 'module': 'CRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 7, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:campaign_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Campaign', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00944', 'parent': 'Campaign', 'read': 1, 'create': 0, 'creation': '2010-04-26 17:09:28', 'modified': '2010-09-20 09:04:15', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 1, 'parenttype': 'DocType', 'role': 'Sales Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00945', 'parent': 'Campaign', 'read': 1, 'create': 0, 'creation': '2010-04-26 17:09:28', 'modified': '2010-09-20 09:04:15', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 2, 'parenttype': 'DocType', 'role': 'Sales Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00957', 'parent': 'Campaign', 'read': 1, 'create': 0, 'creation': '2010-04-26 17:11:41', 'modified': '2010-09-20 09:04:15', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 3, 'parenttype': 'DocType', 'role': 'Sales Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00977', 'parent': 'Campaign', 'read': 1, 'create': 0, 'creation': '2010-04-26 17:14:01', 'modified': '2010-09-20 09:04:15', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 4, 'parenttype': 'DocType', 'role': 'Sales User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00978', 'parent': 'Campaign', 'read': 1, 'create': 0, 'creation': '2010-04-26 17:14:01', 'modified': '2010-09-20 09:04:15', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 5, 'parenttype': 'DocType', 'role': 'Sales User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00522', 'parent': 'Campaign', 'read': 1, 'create': 1, 'creation': '2009-11-24 14:43:37', 'modified': '2010-09-20 09:04:15', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 6, 'parenttype': 'DocType', 'role': 'Sales Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Campaign', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04830', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 09:04:15', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2009-11-24 14:43:37', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Campaign', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Campaign', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03402', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 09:04:15', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-24 14:43:37', 'doctype': 'DocField', 'oldfieldname': 'campaign_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Campaign Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Campaign', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03403', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-20 09:04:15', 'parenttype': 'DocType', 'fieldname': 'campaign_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-11-24 14:43:37', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Campaign', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03404', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-09-20 09:04:15', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/crm/doctype/customer/customer.txt b/crm/doctype/customer/customer.txt
deleted file mode 100644
index fb7b12020a..0000000000
--- a/crm/doctype/customer/customer.txt
+++ /dev/null
@@ -1,1205 +0,0 @@
-[
-	{
-		'_last_update': '1306307673',
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': 0,
-		'allow_rename': None,
-		'allow_trash': 1,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:56',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-26 17:31:31',
-		'modified_by': 'Guest',
-		'module': 'CRM',
-		'name': 'Customer',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'customer_name,customer_group,country,territory',
-		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': "eval:'%(customer_name)s'=='%(name)s' ? ' ' : '%(customer_name)s'",
-		'tag_fields': 'customer_group,customer_type',
-		'use_template': None,
-		'version': 431
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:08:56',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-05-10 17:41:08',
-		'modified_by': 'Administrator',
-		'name': 'PERM00150',
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:08:56',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-05-10 17:41:08',
-		'modified_by': 'Administrator',
-		'name': 'PERM00151',
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:08:56',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-05-10 17:41:08',
-		'modified_by': 'Administrator',
-		'name': 'PERM00152',
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:08:56',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2011-05-10 17:41:08',
-		'modified_by': 'Administrator',
-		'name': 'PERM00153',
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:08:56',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2011-05-10 17:41:08',
-		'modified_by': 'Administrator',
-		'name': 'PERM00154',
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales Master Manager',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:08:56',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2011-05-10 17:41:08',
-		'modified_by': 'Administrator',
-		'name': 'PERM00155',
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales Master Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-27 18:28:51',
-		'default': None,
-		'depends_on': None,
-		'description': 'Note: You Can Manage Multiple Address or Contacts via Addresses & Contacts',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Basic Info',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL04814',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_name',
-		'fieldtype': 'Data',
-		'hidden': 0,
-		'icon': None,
-		'idx': 2,
-		'in_filter': 1,
-		'label': 'Customer Name',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL00830',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'customer_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': 0,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:47:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_type',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Customer Type',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL03770',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer_type',
-		'oldfieldtype': 'Select',
-		'options': '\nCompany\nIndividual',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-22 11:41:50',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'naming_series',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Series',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': '000000554',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'CUST',
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:56',
-		'default': None,
-		'depends_on': None,
-		'description': 'Fetch lead which will be converted into customer.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'lead_name',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 5,
-		'in_filter': 1,
-		'label': 'Lead Ref',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL00835',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'lead_name',
-		'oldfieldtype': 'Link',
-		'options': 'Lead',
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-27 18:28:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL04815',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:56',
-		'default': None,
-		'depends_on': None,
-		'description': 'To manage Customer Groups, click here',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_group',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 7,
-		'in_filter': 1,
-		'label': 'Customer Group',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL00831',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer_group',
-		'oldfieldtype': 'Link',
-		'options': 'Customer Group',
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:56',
-		'default': None,
-		'depends_on': None,
-		'description': 'To manage Territory, click here',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'territory',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Territory',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL00833',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'territory',
-		'oldfieldtype': 'Link',
-		'options': 'Territory',
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-27 18:28:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Address & Contacts',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL04816',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-27 18:28:51',
-		'default': None,
-		'depends_on': 'eval:doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Address Desc',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL04817',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Addresses will appear only when you save the customer',
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-27 18:28:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Address HTML',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL04818',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-27 18:28:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL04819',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-27 18:28:51',
-		'default': None,
-		'depends_on': 'eval:doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Contact Desc',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL04820',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Contact Details will appear only when you save the customer',
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-27 18:28:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Contact HTML',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL04821',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-27 18:28:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'More Info',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL04822',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': 'To create an Account Head under a different company, then set the company and click the button below.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL00855',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': "Your Customer's TAX registration numbers (if applicable) or any general information",
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_details',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Customer Details',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL00856',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer_details',
-		'oldfieldtype': 'Code',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-27 18:28:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL04823',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-10-27 15:24:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'credit_days',
-		'fieldtype': 'Int',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Credit Days',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL04075',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'credit_days',
-		'oldfieldtype': 'Int',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-10-27 15:24:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'credit_limit',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'Credit Limit',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL04076',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'credit_limit',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-25 17:52:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'website',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
-		'label': 'Website',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': '000000572',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-27 18:28:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
-		'label': 'Sales Team',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL04824',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:32:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'default_sales_partner',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': None,
-		'label': 'Default Sales Partner',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL04134',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'default_sales_partner',
-		'oldfieldtype': 'Link',
-		'options': 'Sales Partner',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:32:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'default_commission_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 24,
-		'in_filter': None,
-		'label': 'Default Commission Rate',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL04135',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'default_commission_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:32:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'sales_team',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 25,
-		'in_filter': None,
-		'label': 'Sales Team Details',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL04136',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'sales_team',
-		'oldfieldtype': 'Table',
-		'options': 'Sales Team',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-27 18:28:51',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 26,
-		'in_filter': None,
-		'label': 'Transaction History',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL04825',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-27 18:28:51',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 27,
-		'in_filter': None,
-		'label': 'History HTML',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL04826',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'trash_reason',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 28,
-		'in_filter': None,
-		'label': 'Trash Reason',
-		'modified': '2011-05-27 18:28:51',
-		'modified_by': 'Guest',
-		'name': 'FL00827',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'trash_reason',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/crm/doctype/enquiry/enquiry.txt b/crm/doctype/enquiry/enquiry.txt
deleted file mode 100644
index 26a5587328..0000000000
--- a/crm/doctype/enquiry/enquiry.txt
+++ /dev/null
@@ -1,1529 +0,0 @@
-[
-	{
-		'_last_update': '1305205067',
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:00',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Transaction',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-12 18:27:46',
-		'modified_by': 'Guest',
-		'module': 'CRM',
-		'name': 'Enquiry',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'status,transaction_date,customer,lead,enquiry_type,territory,company',
-		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': 'To %(customer_name)s%(lead_name)s on %(transaction_date)s',
-		'tag_fields': None,
-		'use_template': None,
-		'version': 586
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:00',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2010-09-29 11:08:48',
-		'modified_by': 'ashwini@webnotestech.com',
-		'name': 'PERM00219',
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:00',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2010-09-29 11:08:48',
-		'modified_by': 'ashwini@webnotestech.com',
-		'name': 'PERM00220',
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:00',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2010-09-29 11:08:48',
-		'modified_by': 'ashwini@webnotestech.com',
-		'name': 'PERM00221',
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:00',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2010-09-29 11:08:48',
-		'modified_by': 'ashwini@webnotestech.com',
-		'name': 'PERM00222',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Enquiry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:00',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2010-09-29 11:08:48',
-		'modified_by': 'ashwini@webnotestech.com',
-		'name': 'PERM00223',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Enquiry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:00',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2010-09-29 11:08:48',
-		'modified_by': 'ashwini@webnotestech.com',
-		'name': 'PERM00224',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Enquiry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:44:45',
-		'default': None,
-		'depends_on': None,
-		'description': 'Enter customer enquiry for which you might raise a quotation in future',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Basic Info',
-		'modified': '2011-05-25 12:44:45',
-		'modified_by': 'Guest',
-		'name': 'FL05166',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:00',
-		'default': 'ENQ',
-		'depends_on': None,
-		'description': 'To manage multiple series please go to Setup > Manage Series',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'naming_series',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Series',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01222',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'naming_series',
-		'oldfieldtype': 'Select',
-		'options': 'ENQUIRY\nENQ',
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:00',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'enquiry_from',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Enquiry From',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01224',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'enquiry_from',
-		'oldfieldtype': 'Select',
-		'options': '\nLead\nCustomer',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 0,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:00',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Customer',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01225',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer',
-		'oldfieldtype': 'Link',
-		'options': 'Customer',
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 0,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_address',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': 1,
-		'label': 'Customer Address',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL05158',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Address',
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:00',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_person',
-		'fieldtype': 'Link',
-		'hidden': 1,
-		'icon': None,
-		'idx': 6,
-		'in_filter': 1,
-		'label': 'Contact Person',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01229',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:02',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_name',
-		'fieldtype': 'Data',
-		'hidden': 0,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Customer Name',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL03786',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:00',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'lead',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 8,
-		'in_filter': 1,
-		'label': 'Lead',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01226',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'lead',
-		'oldfieldtype': 'Link',
-		'options': 'Lead',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:00',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'lead_name',
-		'fieldtype': 'Data',
-		'hidden': 0,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Name',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01227',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'lead_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'address_display',
-		'fieldtype': 'Small Text',
-		'hidden': 0,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Address',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL05159',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'address',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_display',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Contact',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL05160',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_mobile',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Contact Mobile No',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL05161',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:44',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_email',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Contact Email',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL05162',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:45',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:45',
-		'modified_by': 'Guest',
-		'name': 'FL05167',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'sneha@webnotestech.com',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:01',
-		'default': 'Today',
-		'depends_on': None,
-		'description': 'The date at which current entry is made in system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'transaction_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Enquiry Date',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01232',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'transaction_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': '50px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'enquiry_type',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': 'Enquiry Type',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01233',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'enquiry_type',
-		'oldfieldtype': 'Select',
-		'options': 'Sales\nMaintenance',
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:00',
-		'default': 'Draft',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Status',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01223',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Select',
-		'options': '\nDraft\nSubmitted\nQuotation Sent\nOrder Confirmed\nEnquiry Lost\nCancelled',
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Amended From',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01234',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Amendment Date',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01235',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:01',
-		'default': None,
-		'depends_on': None,
-		'description': 'To Manage Territory, click here',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'territory',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 20,
-		'in_filter': 1,
-		'label': 'Territory',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01230',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Territory',
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': 0,
-		'colour': None,
-		'creation': '2010-08-08 17:09:01',
-		'default': None,
-		'depends_on': 'eval:doc.enquiry_from=="Customer"',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_group',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 21,
-		'in_filter': 0,
-		'label': 'Customer Group',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01245',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'customer_group',
-		'oldfieldtype': 'Link',
-		'options': 'Customer Group',
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': 0,
-		'reqd': 0,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:44:45',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
-		'label': 'Items',
-		'modified': '2011-05-25 12:44:45',
-		'modified_by': 'Guest',
-		'name': 'FL05168',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:01',
-		'default': None,
-		'depends_on': None,
-		'description': "Items which do not exist in Item master can also be entered on customer's request",
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'enquiry_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': None,
-		'label': 'Enquiry Details',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01237',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'enquiry_details',
-		'oldfieldtype': 'Table',
-		'options': 'Enquiry Detail',
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:44:45',
-		'default': None,
-		'depends_on': None,
-		'description': 'Filing in Additional Information about the Enquiry will help you analyze your data better.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 24,
-		'in_filter': None,
-		'label': 'More Info',
-		'modified': '2011-05-25 12:44:45',
-		'modified_by': 'Guest',
-		'name': 'FL05169',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:45',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 25,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:45',
-		'modified_by': 'Guest',
-		'name': 'FL05170',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 26,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01242',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 27,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01243',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'source',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 28,
-		'in_filter': None,
-		'label': 'Source',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01240',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'source',
-		'oldfieldtype': 'Select',
-		'options': "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign\nWalk In",
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:01',
-		'default': None,
-		'depends_on': None,
-		'description': 'Enter name of campaign if source of enquiry is campaign',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'campaign',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 29,
-		'in_filter': None,
-		'label': 'Campaign',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01241',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'campaign',
-		'oldfieldtype': 'Link',
-		'options': 'Campaign',
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:01',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'order_lost_reason',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 30,
-		'in_filter': None,
-		'label': 'Order Lost Reason',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01248',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'order_lost_reason',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': 0,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:45',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 31,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:45',
-		'modified_by': 'Guest',
-		'name': 'FL05171',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:01',
-		'default': None,
-		'depends_on': None,
-		'description': 'Your sales person who will contact the customer in future',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_by',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 32,
-		'in_filter': 1,
-		'label': 'Next Contact By',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01250',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'contact_by',
-		'oldfieldtype': 'Link',
-		'options': 'Sales Person',
-		'owner': 'dhanalekshmi@webnotestech.com',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '75px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:01',
-		'default': None,
-		'depends_on': None,
-		'description': 'Your sales person will get a reminder on this date to contact the customer',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 33,
-		'in_filter': None,
-		'label': 'Next Contact Date',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01251',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'contact_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'dhanalekshmi@webnotestech.com',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 0,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:01',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': 'Date on which the lead was last contacted',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'last_contact_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 34,
-		'in_filter': None,
-		'label': 'Last Contact Date',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01252',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'last_contact_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'dhanalekshmi@webnotestech.com',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'to_discuss',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 35,
-		'in_filter': None,
-		'label': 'To Discuss',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01254',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'to_discuss',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'dhanalekshmi@webnotestech.com',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:44:45',
-		'default': None,
-		'depends_on': None,
-		'description': 'Keep a track of communication related to this enquiry which will help for future reference.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 36,
-		'in_filter': None,
-		'label': 'Communication History',
-		'modified': '2011-05-25 12:44:45',
-		'modified_by': 'Guest',
-		'name': 'FL05172',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'sneha@webnotestech.com',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'follow_up',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 37,
-		'in_filter': None,
-		'label': 'Follow Up',
-		'modified': '2011-05-25 12:44:44',
-		'modified_by': 'Guest',
-		'name': 'FL01256',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'follow_up',
-		'oldfieldtype': 'Table',
-		'options': 'Follow up',
-		'owner': 'sneha@webnotestech.com',
-		'parent': 'Enquiry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/crm/doctype/enquiry_attachment_detail/enquiry_attachment_detail.txt b/crm/doctype/enquiry_attachment_detail/enquiry_attachment_detail.txt
deleted file mode 100644
index c50339e77a..0000000000
--- a/crm/doctype/enquiry_attachment_detail/enquiry_attachment_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-12-11 11:38:27', 'search_fields': None, 'module': 'CRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'dhanalekshmi@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 3, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': None, 'name': 'Enquiry Attachment Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00530', 'parent': 'Enquiry Attachment Detail', 'read': None, 'create': None, 'creation': '2009-12-11 11:38:27', 'modified': '2010-08-08 11:11:22', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 1, 'parenttype': 'DocType', 'role': '', 'owner': 'dhanalekshmi@webnotestech.com', 'docstatus': 0, 'permlevel': None, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-12-11 11:38:27', 'doctype': 'DocField', 'oldfieldname': 'select_file', 'owner': 'dhanalekshmi@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Select File For Attachment', 'width': '200px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Enquiry Attachment Detail', 'search_index': None, 'allow_on_submit': 1, 'icon': None, 'name': 'FL03493', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-08-08 11:11:22', 'parenttype': 'DocType', 'fieldname': 'select_file', 'fieldtype': 'Link', 'options': 'File', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/crm/doctype/enquiry_detail/enquiry_detail.txt b/crm/doctype/enquiry_detail/enquiry_detail.txt
deleted file mode 100644
index 01e61ed005..0000000000
--- a/crm/doctype/enquiry_detail/enquiry_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-10-08 14:19:27', 'search_fields': None, 'module': 'CRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 59, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Enquiry Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-11-24 16:20:41', 'doctype': 'DocField', 'oldfieldname': 'item_code', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Item Code', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Enquiry Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03405', 'idx': 1, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-01 14:51:49', 'parenttype': 'DocType', 'fieldname': 'item_code', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-24 16:20:41', 'doctype': 'DocField', 'oldfieldname': 'item_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Item Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Enquiry Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03406', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-08-01 14:51:49', 'parenttype': 'DocType', 'fieldname': 'item_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-12-18 14:38:27', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'dhanalekshmi@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Description', 'width': '200px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Enquiry Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03527', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-08-01 14:51:49', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-06 15:43:58', 'doctype': 'DocField', 'oldfieldname': 'qty', 'owner': 'saumil@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Qty', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Enquiry Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03546', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-08-01 14:51:49', 'parenttype': 'DocType', 'fieldname': 'qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-11-24 16:20:41', 'doctype': 'DocField', 'oldfieldname': 'uom', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'UOM', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Enquiry Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03408', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-08-01 14:51:49', 'parenttype': 'DocType', 'fieldname': 'uom', 'fieldtype': 'Link', 'options': 'UOM', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-04-23 17:01:00', 'doctype': 'DocField', 'oldfieldname': 'item_group', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Item Group', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Enquiry Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04892', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-08-01 14:51:49', 'parenttype': 'DocType', 'fieldname': 'item_group', 'fieldtype': 'Link', 'options': 'Item Group', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-04-23 17:01:00', 'doctype': 'DocField', 'oldfieldname': 'brand', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Brand', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Enquiry Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04893', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-08-01 14:51:49', 'parenttype': 'DocType', 'fieldname': 'brand', 'fieldtype': 'Link', 'options': 'Brand', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-05-04 11:20:50', 'doctype': 'DocField', 'oldfieldname': 'basic_rate', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Basic Rate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Enquiry Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04970', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-08-01 14:51:49', 'parenttype': 'DocType', 'fieldname': 'basic_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/crm/doctype/follow_up/follow_up.txt b/crm/doctype/follow_up/follow_up.txt
deleted file mode 100644
index 71766bbf6a..0000000000
--- a/crm/doctype/follow_up/follow_up.txt
+++ /dev/null
@@ -1,197 +0,0 @@
-[
-	{
-		'_last_update': '1303109476',
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:02',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': 1,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-09 15:40:46',
-		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'Follow up',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Tray',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 9
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-08-08 17:09:02',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': 1,
-		'label': 'Date',
-		'modified': '2011-05-09 15:40:46',
-		'modified_by': 'Administrator',
-		'name': 'FL01361',
-		'no_copy': None,
-		'oldfieldname': 'date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Follow up',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-08-08 17:09:02',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'notes',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Notes',
-		'modified': '2011-05-09 15:40:46',
-		'modified_by': 'Administrator',
-		'name': 'FL01362',
-		'no_copy': None,
-		'oldfieldname': 'notes',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Follow up',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '300px'
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:02',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'follow_up_type',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 1,
-		'label': 'Follow up type',
-		'modified': '2011-05-09 15:40:46',
-		'modified_by': 'Administrator',
-		'name': 'FL01363',
-		'no_copy': None,
-		'oldfieldname': 'follow_up_type',
-		'oldfieldtype': 'Select',
-		'options': '\nPhone\nEmail\nSMS\nVisit\nOther',
-		'owner': 'Administrator',
-		'parent': 'Follow up',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-12-14 10:32:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'follow_up_by',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Follow up by',
-		'modified': '2011-05-09 15:40:46',
-		'modified_by': 'Administrator',
-		'name': 'FL04147',
-		'no_copy': None,
-		'oldfieldname': 'follow_up_by',
-		'oldfieldtype': 'Link',
-		'options': 'Profile',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Follow up',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/crm/doctype/industry_type/industry_type.txt b/crm/doctype/industry_type/industry_type.txt
deleted file mode 100644
index f7f4245529..0000000000
--- a/crm/doctype/industry_type/industry_type.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-05-04 12:28:02', 'search_fields': None, 'module': 'CRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'harshada@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 5, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'field:industry', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Industry Type', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00998', 'parent': 'Industry Type', 'read': 1, 'create': 1, 'creation': '2010-05-04 12:28:02', 'modified': '2010-09-20 09:41:52', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Sales Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00999', 'parent': 'Industry Type', 'read': 1, 'create': None, 'creation': '2010-05-04 12:31:05', 'modified': '2010-09-20 09:41:52', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'Sales User', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01000', 'parent': 'Industry Type', 'read': 1, 'create': 1, 'creation': '2010-05-04 12:31:05', 'modified': '2010-09-20 09:41:52', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'Sales Master Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-05-04 12:28:02', 'doctype': 'DocField', 'oldfieldname': 'industry', 'owner': 'harshada@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Industry', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Industry Type', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04976', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 09:41:52', 'parenttype': 'DocType', 'fieldname': 'industry', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/crm/doctype/installation_note/installation_note.txt b/crm/doctype/installation_note/installation_note.txt
deleted file mode 100644
index 4b4fc4148f..0000000000
--- a/crm/doctype/installation_note/installation_note.txt
+++ /dev/null
@@ -1,1205 +0,0 @@
-[
-	{
-		'_last_update': '1305630270',
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'IN/.####',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:04',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-17 16:34:30',
-		'modified_by': 'Guest',
-		'module': 'CRM',
-		'name': 'Installation Note',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': 'At %(customer_name)s on %(inst_date)s',
-		'tag_fields': None,
-		'use_template': None,
-		'version': 96
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:04',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2010-09-17 12:05:21',
-		'modified_by': 'ashwini@webnotestech.com',
-		'name': 'PERM00265',
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:04',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2010-09-17 12:05:21',
-		'modified_by': 'ashwini@webnotestech.com',
-		'name': 'PERM00266',
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:04',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2010-09-17 12:05:21',
-		'modified_by': 'ashwini@webnotestech.com',
-		'name': 'PERM00267',
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:04',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2010-09-17 12:05:21',
-		'modified_by': 'ashwini@webnotestech.com',
-		'name': 'PERM00268',
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:04',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2010-09-17 12:05:21',
-		'modified_by': 'ashwini@webnotestech.com',
-		'name': 'PERM00269',
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:04',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2010-09-17 12:05:21',
-		'modified_by': 'ashwini@webnotestech.com',
-		'name': 'PERM00270',
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:48',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Installation Note',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL05181',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:48',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL05182',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-10-12 15:19:26',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'naming_series',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Series',
-		'modified': '2011-05-25 12:44:47',
-		'modified_by': 'Guest',
-		'name': 'FL03978',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'naming_series',
-		'oldfieldtype': 'Select',
-		'options': '\nIN',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:02',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Customer',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL03787',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer',
-		'oldfieldtype': 'Link',
-		'options': 'Customer',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:48',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_address',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Customer Address',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL05174',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Address',
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_person',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Contact Person',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL01525',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Name',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL01523',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:48',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'address_display',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Address',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL05175',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:48',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_display',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Contact',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL05176',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:48',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_mobile',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Mobile No',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL05177',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:48',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_email',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Contact Email',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL05178',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'territory',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': 1,
-		'label': 'Territory',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL01526',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Territory',
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:48',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_group',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Customer Group',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL05179',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Customer Group',
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:48',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL05183',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'inst_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Installation Date',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL01533',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'inst_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'inst_time',
-		'fieldtype': 'Time',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': 'Installation Time',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL01534',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'inst_time',
-		'oldfieldtype': 'Time',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': 'Draft',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Status',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL01532',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Select',
-		'options': 'Draft\nSubmitted\nCancelled',
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': 'Select the relevant company name if you have multiple companies.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL01535',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Select',
-		'options': 'link:Company',
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL01536',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'Amended From',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL01529',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': 'The date at which current entry is corrected in the system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'hidden': 1,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
-		'label': 'Amendment Date',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL01530',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'remarks',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
-		'label': 'Remarks',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL01537',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'remarks',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'cancel_reason',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 23,
-		'in_filter': None,
-		'label': 'Cancel Reason',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL01538',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'cancel_reason',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:48',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 24,
-		'in_filter': None,
-		'label': 'Item Details',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL05184',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'delivery_note_no',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 25,
-		'in_filter': None,
-		'label': 'Delivery Note No',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL01527',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'delivery_note_no',
-		'oldfieldtype': 'Link',
-		'options': 'Delivery Note',
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': 0,
-		'icon': None,
-		'idx': 26,
-		'in_filter': None,
-		'label': 'Get Items',
-		'modified': '2010-09-17 12:05:21',
-		'modified_by': 'ashwini@webnotestech.com',
-		'name': 'FL01528',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'pull_delivery_note_details',
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-19 14:05:12',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': 0,
-		'icon': None,
-		'idx': 26,
-		'in_filter': None,
-		'label': 'Get Items',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': '000002566',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'pull_delivery_note_details',
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'installed_item_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 27,
-		'in_filter': None,
-		'label': 'Installed Item Details',
-		'modified': '2011-05-25 12:44:48',
-		'modified_by': 'Guest',
-		'name': 'FL01540',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'installed_item_details',
-		'oldfieldtype': 'Table',
-		'options': 'Installed Item Details',
-		'owner': 'Administrator',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/crm/doctype/installed_item_details/installed_item_details.txt b/crm/doctype/installed_item_details/installed_item_details.txt
deleted file mode 100644
index ea67565a06..0000000000
--- a/crm/doctype/installed_item_details/installed_item_details.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-06-30 07:28:32', 'search_fields': None, 'module': 'CRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 24, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'IID/.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Installed Item Details', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-06-30 07:28:32', 'doctype': 'DocField', 'oldfieldname': 'item_code', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Item Code', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Installed Item Details', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05484', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-07-07 11:00:30', 'parenttype': 'DocType', 'fieldname': 'item_code', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-06-30 07:28:32', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Installed Item Details', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05485', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-07-07 11:00:30', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-06-30 12:51:00', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_date', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 0, 'modified_by': 'Administrator', 'label': 'Delivery Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 1, 'description': None, 'parent': 'Installed Item Details', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05502', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-07-07 11:00:30', 'parenttype': 'DocType', 'fieldname': 'prevdoc_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-06-30 07:28:32', 'doctype': 'DocField', 'oldfieldname': 'qty', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Installed Qty', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Installed Item Details', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05487', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-07-07 11:00:30', 'parenttype': 'DocType', 'fieldname': 'qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-06-30 07:28:32', 'doctype': 'DocField', 'oldfieldname': 'serial_no', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Serial No', 'width': '180px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Installed Item Details', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05488', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-07-07 11:00:30', 'parenttype': 'DocType', 'fieldname': 'serial_no', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2010-06-30 07:28:32', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_detail_docname', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Against Document Detail No', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Installed Item Details', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05489', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-07-07 11:00:30', 'parenttype': 'DocType', 'fieldname': 'prevdoc_detail_docname', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2010-06-30 12:35:29', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_docname', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Against Document No', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Installed Item Details', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL05499', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-07-07 11:00:30', 'parenttype': 'DocType', 'fieldname': 'prevdoc_docname', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2010-06-30 12:35:29', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_doctype', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Document Type', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Installed Item Details', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL05500', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-07-07 11:00:30', 'parenttype': 'DocType', 'fieldname': 'prevdoc_doctype', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/crm/doctype/lead/lead.txt b/crm/doctype/lead/lead.txt
deleted file mode 100644
index 6c77978ef3..0000000000
--- a/crm/doctype/lead/lead.txt
+++ /dev/null
@@ -1,1840 +0,0 @@
-[
-	{
-		'_last_update': '1305009922',
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': 1,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-10 12:15:21',
-		'modified_by': 'Guest',
-		'module': 'CRM',
-		'name': 'Lead',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'lead_name,lead_owner,status',
-		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': '%(lead_name)s from %(company_name)s | To Discuss: %(to_discuss)s',
-		'tag_fields': 'status,source',
-		'use_template': None,
-		'version': 394
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:07',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2010-10-19 11:33:05',
-		'modified_by': 'ashwini@webnotestech.com',
-		'name': 'PERM00314',
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:07',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2010-10-19 11:33:05',
-		'modified_by': 'ashwini@webnotestech.com',
-		'name': 'PERM00315',
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:07',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2010-10-19 11:33:05',
-		'modified_by': 'ashwini@webnotestech.com',
-		'name': 'PERM00316',
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Lead',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales Manager',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 1,
-		'creation': '2010-08-08 17:09:07',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2010-10-19 11:33:05',
-		'modified_by': 'ashwini@webnotestech.com',
-		'name': 'PERM00317',
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Lead',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:07',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2010-10-19 11:33:05',
-		'modified_by': 'ashwini@webnotestech.com',
-		'name': 'PERM00318',
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'All',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 1,
-		'creation': '2010-08-08 17:09:07',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2010-10-19 11:33:05',
-		'modified_by': 'ashwini@webnotestech.com',
-		'name': 'PERM00319',
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-10-07 12:49:37',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 7,
-		'match': None,
-		'modified': '2010-10-19 11:33:05',
-		'modified_by': 'ashwini@webnotestech.com',
-		'name': 'PERM00707',
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Guest',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:44:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Basic Info',
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL05191',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL05192',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'lead_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 1,
-		'label': 'Contact Name',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL01766',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'lead_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'source',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Source',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL01768',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'source',
-		'oldfieldtype': 'Select',
-		'options': "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign\nWebsite",
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': "eval:doc.source == 'Existing Customer'",
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'From Customer',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL01769',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer',
-		'oldfieldtype': 'Link',
-		'options': 'Customer',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': "eval:doc.source == 'Campaign'",
-		'description': 'Enter campaign name if the source of lead is campaign.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'campaign_name',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Campaign Name',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL01793',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'campaign_name',
-		'oldfieldtype': 'Link',
-		'options': 'Campaign',
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': 'Name of organization from where lead has come',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': 1,
-		'label': 'Company Name',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL01770',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'company_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'default': 'LEAD',
-		'depends_on': None,
-		'description': 'To manage multiple series please go to Setup > Manage Series',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'naming_series',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Series',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL01763',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'naming_series',
-		'oldfieldtype': 'Select',
-		'options': 'LEAD\nLEAD/10-11/\nLEAD/MUMBAI/\nLEAD/AGENT1/\nLEAD/AGENT2/',
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'default': 'Open',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': 1,
-		'label': 'Status',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL01764',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Select',
-		'options': '\nOpen\nAttempted to Contact\nContact in Future\nContacted\nInterested\nNot interested\nLead Lost\nConverted',
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': 'Today',
-		'depends_on': None,
-		'description': 'The date at which current entry is made in system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'transaction_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': 1,
-		'label': 'Lead Date',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL01767',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'transaction_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL05193',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'type',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': 1,
-		'label': 'Lead Type',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL01771',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'type',
-		'oldfieldtype': 'Select',
-		'options': '\nClient\nChannel Partner\nConsultant',
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-10-07 12:51:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'request_type',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Request Type',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL03976',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'request_type',
-		'oldfieldtype': 'Select',
-		'options': '\nProduct Enquiry\nRequest for Information\nSuggestions\nOther',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': 'Probability of lead converting to customer',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'rating',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': 1,
-		'label': 'Rating',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL01772',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'rating',
-		'oldfieldtype': 'Select',
-		'options': '\nHot\nWarm\nCold',
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'remark',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Remark',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL01773',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'remark',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 0,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': "eval:doc.status == 'Lead Lost'",
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'order_lost_reason',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': 'Lost Reason',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL01765',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'order_lost_reason',
-		'oldfieldtype': 'Link',
-		'options': 'Order Lost Reason',
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-10-19 13:01:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'trash_reason',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Trash Reason',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL04091',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'trash_reason',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Contact Info',
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL05194',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:44:50',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'phone',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Phone',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL05187',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'contact_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'mobile_no',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'Mobile No.',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL01776',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'mobile_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'email_id',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
-		'label': 'Email Id',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL01777',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'email_id',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fax',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
-		'label': 'Fax',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL01778',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'fax',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'website',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': None,
-		'label': 'Website',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL01779',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'website',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': 'To manage Territory, click here',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'territory',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 24,
-		'in_filter': None,
-		'label': 'Territory',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL01780',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'territory',
-		'oldfieldtype': 'Link',
-		'options': 'Territory',
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 25,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL05195',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'address_line1',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 26,
-		'in_filter': None,
-		'label': 'Address Line 1',
-		'modified': '2011-05-25 12:44:50',
-		'modified_by': 'Guest',
-		'name': 'FL01782',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'address_line1',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'address_line2',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 27,
-		'in_filter': None,
-		'label': 'Address Line 2',
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL01783',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'address_line2',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'city',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 28,
-		'in_filter': None,
-		'label': 'City',
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL01784',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'city',
-		'oldfieldtype': 'Select',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'country',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 29,
-		'in_filter': None,
-		'label': 'Country',
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL01785',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'country',
-		'oldfieldtype': 'Select',
-		'options': 'link:Country',
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'state',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 30,
-		'in_filter': None,
-		'label': 'State',
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL01786',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'state',
-		'oldfieldtype': 'Select',
-		'options': 'link:State',
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'pincode',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 31,
-		'in_filter': None,
-		'label': 'Pin Code',
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL01787',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'pincode',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:44:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 32,
-		'in_filter': None,
-		'label': 'More Info',
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL05196',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 33,
-		'in_filter': None,
-		'label': 'Company',
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL01795',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': '__user',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'lead_owner',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 34,
-		'in_filter': 1,
-		'label': 'Lead Owner',
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL01790',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'lead_owner',
-		'oldfieldtype': 'Link',
-		'options': 'Profile',
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'market_segment',
-		'fieldtype': 'Select',
-		'hidden': 0,
-		'icon': None,
-		'idx': 35,
-		'in_filter': 1,
-		'label': 'Market Segment',
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL01791',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'market_segment',
-		'oldfieldtype': 'Select',
-		'options': '\nLower Income\nMiddle Income\nUpper Income',
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'industry',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 36,
-		'in_filter': None,
-		'label': 'Industry',
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL01792',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'industry',
-		'oldfieldtype': 'Link',
-		'options': 'Industry Type',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': 'Your products or facilities in which the lead is interested',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'interested_in',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 37,
-		'in_filter': None,
-		'label': 'Interested In',
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL01794',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'interested_in',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': 1,
-		'icon': None,
-		'idx': 38,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL01796',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 39,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL05197',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': 0,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': 'Your sales person who will contact the lead in future',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_by',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 40,
-		'in_filter': 1,
-		'label': 'Next Contact By',
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL01798',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'contact_by',
-		'oldfieldtype': 'Link',
-		'options': 'Sales Person',
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': 0,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': 'Your sales person will get a reminder on this date to contact the lead',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 41,
-		'in_filter': 1,
-		'label': 'Next Contact Date',
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL01799',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'contact_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:44:51',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': 'Date on which the lead was last contacted',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'last_contact_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 42,
-		'in_filter': None,
-		'label': 'Last Contact Date',
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL05190',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'last_contact_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 0,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'to_discuss',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 43,
-		'in_filter': None,
-		'label': 'To Discuss',
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL01802',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'to_discuss',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:44:51',
-		'default': None,
-		'depends_on': None,
-		'description': 'Keep a track of communication with this lead which will help for future reference.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 44,
-		'in_filter': None,
-		'label': 'Communication History',
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL05198',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 0,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'follow_up',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 45,
-		'in_filter': None,
-		'label': 'Follow up',
-		'modified': '2011-05-25 12:44:51',
-		'modified_by': 'Guest',
-		'name': 'FL01804',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'follow_up',
-		'oldfieldtype': 'Table',
-		'options': 'Follow up',
-		'owner': 'Administrator',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/crm/doctype/plot_control/plot_control.txt b/crm/doctype/plot_control/plot_control.txt
deleted file mode 100644
index cab7968890..0000000000
--- a/crm/doctype/plot_control/plot_control.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-05-17 10:36:31', 'search_fields': None, 'module': 'CRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'harshada@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 215, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': None, 'name': 'Plot Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/crm/doctype/quotation/quotation.txt b/crm/doctype/quotation/quotation.txt
deleted file mode 100644
index bd79446ed5..0000000000
--- a/crm/doctype/quotation/quotation.txt
+++ /dev/null
@@ -1,2929 +0,0 @@
-[
-	{
-		'_last_update': '1306471002',
-		'allow_attach': 1,
-		'allow_copy': None,
-		'allow_email': 0,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': 1,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Transaction',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': 0,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': 1,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': 1,
-		'menu_index': None,
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'Quotation',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': 1,
-		'search_fields': 'status,transaction_date,customer,lead,order_type',
-		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': 'To %(customer_name)s on %(transaction_date)s worth %(currency)s %(grand_total_export)s',
-		'tag_fields': 'status',
-		'use_template': None,
-		'version': 596
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:17',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'PERM00435',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:17',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'PERM00436',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:17',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'PERM00437',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:17',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'PERM00438',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:17',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': 'customer_name',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'PERM00439',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Customer',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:17',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'PERM00440',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Quotation',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Maintenance Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:17',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 7,
-		'match': None,
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'PERM00441',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Quotation',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Maintenance Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:17',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 8,
-		'match': None,
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'PERM00442',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Quotation',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Maintenance User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:17',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 9,
-		'match': None,
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'PERM00443',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Quotation',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Maintenance User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:15:38',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Basic Info',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05280',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-24 10:15:38',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05281',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': 'To manage multiple series please go to Setup > Manage Series',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'naming_series',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Series',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02632',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'naming_series',
-		'oldfieldtype': 'Select',
-		'options': 'QTN',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'quotation_to',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Quotation To',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02634',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'quotation_to',
-		'oldfieldtype': 'Select',
-		'options': '\nLead\nCustomer',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 0,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:48:02',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 5,
-		'in_filter': 1,
-		'label': 'Customer',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL03788',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer',
-		'oldfieldtype': 'Link',
-		'options': 'Customer',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_address',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 6,
-		'in_filter': 1,
-		'label': 'Customer Address',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02638',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Address',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_person',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 7,
-		'in_filter': 1,
-		'label': 'Contact Person',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02639',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'contact_person',
-		'oldfieldtype': 'Link',
-		'options': 'Contact',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Name',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02635',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'lead',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 9,
-		'in_filter': 1,
-		'label': 'Lead',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02636',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'lead',
-		'oldfieldtype': 'Link',
-		'options': 'Lead',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'lead_name',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Name',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02637',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:15:37',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'address_display',
-		'fieldtype': 'Small Text',
-		'hidden': 0,
-		'icon': None,
-		'idx': 11,
-		'in_filter': 0,
-		'label': 'Address',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05271',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer_address',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:15:37',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_display',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': 0,
-		'label': 'Contact',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05272',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:15:37',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_mobile',
-		'fieldtype': 'Text',
-		'hidden': 0,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Mobile No',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05273',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:15:37',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_email',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Contact Email',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05274',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:15:38',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05282',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': 'Today',
-		'depends_on': None,
-		'description': 'The date at which current entry is made in system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'transaction_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': 1,
-		'label': 'Quotation Date',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02642',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'transaction_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'order_type',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': 1,
-		'label': 'Order Type',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02631',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'order_type',
-		'oldfieldtype': 'Select',
-		'options': '\nSales\nMaintenance',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 0,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': 'Draft',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': 1,
-		'label': 'Status',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02633',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Select',
-		'options': '\nDraft\nSubmitted\nOrder Confirmed\nOrder Lost\nCancelled',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Amended From',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02643',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': 'The date at which current entry is corrected in the system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'Amendment Date',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02644',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': "To create Quotation against Enquiry, Select Enquiry No. and click on 'Pull Enquiry Details' ",
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'enq_no',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 21,
-		'in_filter': 1,
-		'label': 'Enquiry No',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02645',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'enq_no',
-		'oldfieldtype': 'Link',
-		'options': 'Enquiry',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': 0,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': 0,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
-		'label': 'Pull Enquiry Detail',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02646',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': 0,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': 'Will be fetched from Customer',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'territory',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 23,
-		'in_filter': 1,
-		'label': 'Territory',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02640',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Territory',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_group',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 24,
-		'in_filter': 1,
-		'label': 'Customer Group',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02680',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer_group',
-		'oldfieldtype': 'Link',
-		'options': 'Customer Group',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:15:38',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 25,
-		'in_filter': None,
-		'label': 'Items',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05283',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 26,
-		'in_filter': None,
-		'label': 'Clear Table',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02650',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'clear_quotation_details',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': 'Select the price list as entered in "Price List" master. This will pull the reference rates of items against this price list as specified in "Item" master.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'price_list_name',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 27,
-		'in_filter': 1,
-		'label': 'Price List',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02651',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'price_list_name',
-		'oldfieldtype': 'Select',
-		'options': 'link:Price List',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-24 10:15:38',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 28,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05284',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': "Customer's currency - If you want to select a currency that is not the default currency, then you must also specify the Currency Conversion Rate.",
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'currency',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 29,
-		'in_filter': 1,
-		'label': 'Currency',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02647',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'currency',
-		'oldfieldtype': 'Select',
-		'options': 'link:Currency',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 0,
-		'trigger': 'Client',
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': '1.00',
-		'depends_on': None,
-		'description': "Rate at which customer's currency is converted to your currency",
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'conversion_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 30,
-		'in_filter': None,
-		'label': 'Currency Conversion Rate',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02648',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'conversion_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-24 10:15:38',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 31,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05285',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Simple',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': 'Field Descriptions for Quotation Details\n\nRef Rate: Rate in your selected Price List. Price Lists help you track discounts.\n\nPage Break: If you want to break the page on this item in the Print Format',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'quotation_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 32,
-		'in_filter': None,
-		'label': 'Quotation Details',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02652',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'quotation_details',
-		'oldfieldtype': 'Table',
-		'options': 'Quotation Detail',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '40px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'net_total',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 33,
-		'in_filter': None,
-		'label': 'Net Total*',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02653',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'net_total',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 34,
-		'in_filter': None,
-		'label': 'Re-Calculate Values',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02654',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:15:38',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 35,
-		'in_filter': None,
-		'label': 'Note HTML',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05286',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': '
Note : * In Base Currency\n
',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:15:38',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 36,
-		'in_filter': None,
-		'label': 'Taxes',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05287',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'charge',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 37,
-		'in_filter': None,
-		'label': 'Select Charges Master',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02657',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'charge',
-		'oldfieldtype': 'Link',
-		'options': 'Other Charges',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': 0,
-		'icon': None,
-		'idx': 38,
-		'in_filter': None,
-		'label': 'Get Charges',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02658',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'other_charges',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 39,
-		'in_filter': None,
-		'label': 'Other Charges',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02659',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'other_charges',
-		'oldfieldtype': 'Table',
-		'options': 'RV Tax Detail',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 40,
-		'in_filter': None,
-		'label': 'Calculate Charges',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02660',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'other_charges_total',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 41,
-		'in_filter': None,
-		'label': 'Charges Total*',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02661',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'other_charges_total',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'grand_total',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 42,
-		'in_filter': None,
-		'label': 'Grand Total*',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02662',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'grand_total',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '200px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-24 10:15:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 43,
-		'in_filter': None,
-		'label': 'Other Charges Calculation',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05288',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-24 10:15:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 44,
-		'in_filter': None,
-		'label': 'OT Notes',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05289',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': '
Note : * In Base Currency\n
',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:15:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 45,
-		'in_filter': None,
-		'label': 'Totals',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05290',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'rounded_total',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 46,
-		'in_filter': None,
-		'label': 'Rounded Total',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02686',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'rounded_total',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '200px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:18',
-		'default': None,
-		'depends_on': None,
-		'description': 'In Words will be visible once you save the Quotation.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'in_words',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 47,
-		'in_filter': None,
-		'label': 'In Words',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02687',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'in_words',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '200px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-24 10:15:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 48,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05291',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'grand_total_export',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 49,
-		'in_filter': None,
-		'label': 'Grand Total (Export)',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02689',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'grand_total_export',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '200px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'rounded_total_export',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 50,
-		'in_filter': None,
-		'label': 'Rounded Total (Export)',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02690',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'rounded_total_export',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '200px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:18',
-		'default': None,
-		'depends_on': None,
-		'description': 'In Words (Export) will be visible once you save the Quotation.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'in_words_export',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 51,
-		'in_filter': None,
-		'label': 'In Words (Export)',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02691',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'in_words_export',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '200px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:15:39',
-		'default': None,
-		'depends_on': None,
-		'description': 'Add Terms and Conditions for the Quotation like Payment Terms, Validity of Offer etc. You can also prepare a master Term Sheet and use the Template',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 52,
-		'in_filter': None,
-		'label': 'Terms',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05292',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-12-14 10:23:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'letter_head',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 53,
-		'in_filter': None,
-		'label': 'Letter Head',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL04223',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'letter_head',
-		'oldfieldtype': 'Select',
-		'options': 'link:Letter Head',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'tc_name',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 54,
-		'in_filter': None,
-		'label': 'Select Terms',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02666',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'tc_name',
-		'oldfieldtype': 'Link',
-		'options': 'Term',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 55,
-		'in_filter': None,
-		'label': 'Get Terms',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02667',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'get_tc_details',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-24 10:15:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 56,
-		'in_filter': None,
-		'label': 'Terms HTML',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05293',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': 'You can add Terms and Notes that will be printed in the Transaction',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'terms',
-		'fieldtype': 'Text Editor',
-		'hidden': None,
-		'icon': None,
-		'idx': 57,
-		'in_filter': None,
-		'label': 'Term Details',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02669',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'terms',
-		'oldfieldtype': 'Text Editor',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:15:39',
-		'default': None,
-		'depends_on': None,
-		'description': 'Filling in additional information about the Quotation will help you analyze your data better.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 58,
-		'in_filter': None,
-		'label': 'More Info',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05294',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:18',
-		'default': None,
-		'depends_on': None,
-		'description': 'Select the relevant company name if you have multiple companies.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 59,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02675',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 60,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02676',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'enq_det',
-		'fieldtype': 'Text',
-		'hidden': 1,
-		'icon': None,
-		'idx': 61,
-		'in_filter': None,
-		'label': 'Enquiry Detail',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02672',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'enq_det',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': 0,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'source',
-		'fieldtype': 'Select',
-		'hidden': 0,
-		'icon': None,
-		'idx': 62,
-		'in_filter': None,
-		'label': 'Source',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02673',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'source',
-		'oldfieldtype': 'Select',
-		'options': "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 0,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'campaign',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 63,
-		'in_filter': None,
-		'label': 'Campaign',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02674',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'campaign',
-		'oldfieldtype': 'Link',
-		'options': 'Campaign',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 0,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-08-08 17:09:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'select_print_heading',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 64,
-		'in_filter': None,
-		'label': 'Select Print Heading',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02683',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'select_print_heading',
-		'oldfieldtype': 'Link',
-		'options': 'Print Heading',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'cancel_reason',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 65,
-		'in_filter': None,
-		'label': 'Cancel Reason',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02677',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'cancel_reason',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': 0,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'order_lost_reason',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 66,
-		'in_filter': None,
-		'label': 'Order Lost Reason',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02678',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'order_lost_reason',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'dhanalekshmi@webnotestech.com',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-24 10:15:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 67,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05295',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-20 17:46:40',
-		'default': None,
-		'depends_on': None,
-		'description': 'Your sales person who will contact the customer/lead in future',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_by',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 68,
-		'in_filter': None,
-		'label': 'Next Contact By',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL03767',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'contact_by',
-		'oldfieldtype': 'Link',
-		'options': 'Profile',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-20 17:46:40',
-		'default': None,
-		'depends_on': None,
-		'description': 'Your sales person will get a reminder on this date to contact the customer/lead',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 69,
-		'in_filter': None,
-		'label': 'Next Contact Date',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL03768',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'contact_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-20 17:46:40',
-		'default': None,
-		'depends_on': None,
-		'description': 'Date on which the lead/customer was last contacted',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'last_contact_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 70,
-		'in_filter': None,
-		'label': 'Last Contact Date',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL03769',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'last_contact_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-20 17:46:40',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'to_discuss',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 71,
-		'in_filter': None,
-		'label': 'To Discuss',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL03771',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'to_discuss',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:15:39',
-		'default': None,
-		'depends_on': None,
-		'description': 'Keep a track on communications regarding this Quotation. This will help you remember earlier communications in case the Customer comes back again',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 72,
-		'in_filter': None,
-		'label': 'Communication History',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL05296',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'follow_up',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 73,
-		'in_filter': None,
-		'label': 'Follow up',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02694',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'follow_up',
-		'oldfieldtype': 'Table',
-		'options': 'Follow up',
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '40px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'file_list',
-		'fieldtype': 'Small Text',
-		'hidden': 1,
-		'icon': None,
-		'idx': 74,
-		'in_filter': None,
-		'label': 'File List',
-		'modified': '2011-06-21 17:17:07',
-		'modified_by': 'Administrator',
-		'name': 'FL02703',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Quotation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/crm/doctype/quotation_detail/quotation_detail.txt b/crm/doctype/quotation_detail/quotation_detail.txt
deleted file mode 100644
index 1196618b85..0000000000
--- a/crm/doctype/quotation_detail/quotation_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': 0, 'creation': '2009-03-12 12:10:03', 'search_fields': None, 'module': 'CRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 23, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': 'QUOD/.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': None, 'name': 'Quotation Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:10:03', 'doctype': 'DocField', 'oldfieldname': 'item_code', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': 0, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Item Code', 'width': '150px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 0, 'description': None, 'parent': 'Quotation Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01048', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-08-05 08:25:32', 'parenttype': 'DocType', 'fieldname': 'item_code', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-21 14:38:24', 'doctype': 'DocField', 'oldfieldname': 'item_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Item Name', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Quotation Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01458', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-08-05 08:25:32', 'parenttype': 'DocType', 'fieldname': 'item_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2009-03-12 12:10:03', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': 0, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Description', 'width': '200px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Quotation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01049', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-08-05 08:25:32', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:10:03', 'doctype': 'DocField', 'oldfieldname': 'stock_uom', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'UOM', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Quotation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01050', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-08-05 08:25:32', 'parenttype': 'DocType', 'fieldname': 'stock_uom', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:10:03', 'doctype': 'DocField', 'oldfieldname': 'qty', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 0, 'print_hide': 0, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Quantity', 'width': '100px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Quotation Detail', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL01052', 'idx': 5, 'default': '0.00', 'colour': None, 'modified': '2010-08-05 08:25:32', 'parenttype': 'DocType', 'fieldname': 'qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:10:03', 'doctype': 'DocField', 'oldfieldname': 'ref_rate', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': 1, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Ref Rate', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Quotation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01053', 'idx': 6, 'default': '0.00', 'colour': None, 'modified': '2010-08-05 08:25:32', 'parenttype': 'DocType', 'fieldname': 'ref_rate', 'fieldtype': 'Currency', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Float', 'creation': '2009-03-12 12:10:03', 'doctype': 'DocField', 'oldfieldname': 'adj_rate', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Discount (%)', 'width': '100px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Quotation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01054', 'idx': 7, 'default': '0.00', 'colour': None, 'modified': '2010-08-05 08:25:32', 'parenttype': 'DocType', 'fieldname': 'adj_rate', 'fieldtype': 'Float', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:10:03', 'doctype': 'DocField', 'oldfieldname': 'export_rate', 'owner': 'Administrator', 'reqd': 0, 'in_filter': 0, 'print_hide': 0, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Rate', 'width': '100px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Quotation Detail', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL01057', 'idx': 8, 'default': '0.00', 'colour': None, 'modified': '2010-08-05 08:25:32', 'parenttype': 'DocType', 'fieldname': 'export_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:10:03', 'doctype': 'DocField', 'oldfieldname': 'export_amount', 'owner': 'Administrator', 'reqd': 0, 'in_filter': 0, 'print_hide': 0, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Amount', 'width': '100px', 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Quotation Detail', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL01058', 'idx': 9, 'default': '0.00', 'colour': None, 'modified': '2010-08-05 08:25:32', 'parenttype': 'DocType', 'fieldname': 'export_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-06-08 11:19:43', 'doctype': 'DocField', 'oldfieldname': 'base_ref_rate', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Ref Rate*', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Quotation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05292', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-08-05 08:25:32', 'parenttype': 'DocType', 'fieldname': 'base_ref_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:10:03', 'doctype': 'DocField', 'oldfieldname': 'basic_rate', 'owner': 'Administrator', 'reqd': 0, 'in_filter': 0, 'print_hide': 1, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Basic Rate*', 'width': '100px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Quotation Detail', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL01055', 'idx': 11, 'default': '0.00', 'colour': None, 'modified': '2010-08-05 08:25:32', 'parenttype': 'DocType', 'fieldname': 'basic_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:10:03', 'doctype': 'DocField', 'oldfieldname': 'amount', 'owner': 'Administrator', 'reqd': 0, 'in_filter': 0, 'print_hide': 1, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Amount*', 'width': '100px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Quotation Detail', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL01056', 'idx': 12, 'default': '0.00', 'colour': None, 'modified': '2010-08-05 08:25:32', 'parenttype': 'DocType', 'fieldname': 'amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-05-26 10:40:03', 'doctype': 'DocField', 'oldfieldname': 'item_group', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Item Group', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Quotation Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02181', 'idx': 13, 'default': None, 'colour': None, 'modified': '2010-08-05 08:25:32', 'parenttype': 'DocType', 'fieldname': 'item_group', 'fieldtype': 'Link', 'options': 'Item Group', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-21 14:38:24', 'doctype': 'DocField', 'oldfieldname': 'brand', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Brand', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Quotation Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01457', 'idx': 14, 'default': None, 'colour': None, 'modified': '2010-08-05 08:25:32', 'parenttype': 'DocType', 'fieldname': 'brand', 'fieldtype': 'Link', 'options': 'Brand', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2009-04-07 16:38:16', 'doctype': 'DocField', 'oldfieldname': 'item_tax_rate', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Item Tax Rate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Quotation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01728', 'idx': 15, 'default': None, 'colour': None, 'modified': '2010-08-05 08:25:32', 'parenttype': 'DocType', 'fieldname': 'item_tax_rate', 'fieldtype': 'Small Text', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Check', 'creation': '2009-09-03 15:07:15', 'doctype': 'DocField', 'oldfieldname': 'page_break', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Page Break', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 0, 'description': None, 'parent': 'Quotation Detail', 'search_index': None, 'allow_on_submit': 1, 'icon': None, 'name': 'FL02916', 'idx': 16, 'default': None, 'colour': None, 'modified': '2010-08-05 08:25:32', 'parenttype': 'DocType', 'fieldname': 'page_break', 'fieldtype': 'Check', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2010-08-05 08:25:32', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_docname', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Against Docname', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Quotation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05832', 'idx': 17, 'default': None, 'colour': None, 'modified': '2010-08-05 08:25:32', 'parenttype': 'DocType', 'fieldname': 'prevdoc_docname', 'fieldtype': 'Data', 'options': None, 'report_hide': 0, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2010-08-05 08:25:33', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_doctype', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Against Doctype', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Quotation Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05833', 'idx': 18, 'default': None, 'colour': None, 'modified': '2010-08-05 08:25:33', 'parenttype': 'DocType', 'fieldname': 'prevdoc_doctype', 'fieldtype': 'Data', 'options': None, 'report_hide': 0, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/crm/doctype/return_detail/return_detail.txt b/crm/doctype/return_detail/return_detail.txt
deleted file mode 100644
index 51152d401a..0000000000
--- a/crm/doctype/return_detail/return_detail.txt
+++ /dev/null
@@ -1,370 +0,0 @@
-[
-	{
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:19',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': 1,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-02-23 19:09:05',
-		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'Return Detail',
-		'name_case': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 12
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_code',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Item Code',
-		'modified': '2011-02-23 19:09:05',
-		'modified_by': 'Administrator',
-		'name': 'FL02844',
-		'no_copy': None,
-		'oldfieldname': 'item_code',
-		'oldfieldtype': 'Link',
-		'options': 'Item',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Return Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Description',
-		'modified': '2011-02-23 19:09:05',
-		'modified_by': 'Administrator',
-		'name': 'FL02845',
-		'no_copy': None,
-		'oldfieldname': 'description',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Return Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'uom',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'UOM',
-		'modified': '2011-02-23 19:09:05',
-		'modified_by': 'Administrator',
-		'name': 'FL02848',
-		'no_copy': None,
-		'oldfieldname': 'uom',
-		'oldfieldtype': 'Link',
-		'options': 'UOM',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Return Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Rate',
-		'modified': '2011-02-23 19:09:05',
-		'modified_by': 'Administrator',
-		'name': 'FL02849',
-		'no_copy': None,
-		'oldfieldname': 'rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Return Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'qty',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Qty',
-		'modified': '2011-02-23 19:09:05',
-		'modified_by': 'Administrator',
-		'name': 'FL02846',
-		'no_copy': None,
-		'oldfieldname': 'qty',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Return Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'returned_qty',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Returned Qty',
-		'modified': '2011-02-23 19:09:05',
-		'modified_by': 'Administrator',
-		'name': 'FL02847',
-		'no_copy': None,
-		'oldfieldname': 'returned_qty',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Return Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-01-21 12:06:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'serial_no',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Serial No',
-		'modified': '2011-02-23 19:09:05',
-		'modified_by': 'Administrator',
-		'name': 'FL04415',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Return Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-01-21 12:06:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'batch_no',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Batch No',
-		'modified': '2011-02-23 19:09:05',
-		'modified_by': 'Administrator',
-		'name': 'FL04416',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Return Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'detail_name',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Detail Name',
-		'modified': '2011-02-23 19:09:05',
-		'modified_by': 'Administrator',
-		'name': 'FL02843',
-		'no_copy': None,
-		'oldfieldname': 'detail_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Return Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/crm/doctype/sales_common/sales_common.txt b/crm/doctype/sales_common/sales_common.txt
deleted file mode 100644
index df360cbe05..0000000000
--- a/crm/doctype/sales_common/sales_common.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-12-09 15:26:59', 'search_fields': None, 'module': 'CRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 342, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': '', 'name': 'Sales Common', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-11-30 22:12:20', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/crm/doctype/sales_order/sales_order.txt b/crm/doctype/sales_order/sales_order.txt
deleted file mode 100644
index f37853c556..0000000000
--- a/crm/doctype/sales_order/sales_order.txt
+++ /dev/null
@@ -1,3276 +0,0 @@
-[
-	{
-		'_last_update': '1308741898',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': "cur_frm.add_fetch('customer','sales_person','sales_person');",
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:21',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Transaction',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': 1,
-		'issingle': 0,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'Sales Order',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': 1,
-		'search_fields': 'status,transaction_date,customer,customer_name, territory,order_type,company',
-		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': 'From %(customer_name)s on %(transaction_date)s worth %(currency)s %(grand_total_export)s | %(per_delivered)s% delivered | %(per_billed)s% billed',
-		'tag_fields': 'delivery_status,billing_status',
-		'use_template': None,
-		'version': 593
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'PERM00494',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'PERM00495',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'PERM00496',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'PERM00497',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': 'customer_name',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'PERM00498',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Customer',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'PERM00499',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Sales Order',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'read': 1,
-		'role': 'Accounts User',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 7,
-		'match': None,
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'PERM00500',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Maintenance Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 8,
-		'match': None,
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'PERM00501',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Maintenance Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 9,
-		'match': None,
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'PERM00502',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Maintenance User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 10,
-		'match': None,
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'PERM00503',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Maintenance User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-03 12:34:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Basic Info',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05546',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': 0,
-		'label': None,
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05547',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': 'To manage multiple series please go to Setup > Manage Series',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'naming_series',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Series',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03010',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'naming_series',
-		'oldfieldtype': 'Select',
-		'options': 'SO\nSO/10-11/',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:48:02',
-		'default': None,
-		'depends_on': None,
-		'description': 'Select Customer',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Customer',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03790',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer',
-		'oldfieldtype': 'Link',
-		'options': 'Customer',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_address',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 5,
-		'in_filter': 1,
-		'label': 'Customer Address',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03013',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Address',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_person',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': 1,
-		'label': 'Contact Person',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03014',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Contact',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Name',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03012',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-24 10:15:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'address_display',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Address',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05339',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-24 10:15:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_display',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Contact',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05340',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-24 10:15:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_mobile',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Mobile No',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05341',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-24 10:15:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_email',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Contact Email',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05342',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'territory',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': 1,
-		'label': 'Territory',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03015',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Territory',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': 'Category of customer as entered in Customer master',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_group',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': 1,
-		'label': 'Customer Group',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03060',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Customer Group',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': 'Purchase Order sent by customer',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'po_no',
-		'fieldtype': 'Data',
-		'hidden': 0,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'P.O. No',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03016',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'po_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'po_date',
-		'fieldtype': 'Date',
-		'hidden': 0,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'P.O. Date',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03017',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'po_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05548',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': 'Today',
-		'depends_on': None,
-		'description': 'The date at which current entry is made in system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'transaction_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': 1,
-		'label': 'Sales Order Date',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03019',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'transaction_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': '160px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'order_type',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Order Type',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03009',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'order_type',
-		'oldfieldtype': 'Select',
-		'options': '\nSales\nMaintenance',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': 'Draft',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': 1,
-		'label': 'Status',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03011',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Select',
-		'options': '\nDraft\nSubmitted\nStopped\nCancelled',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'delivery_date',
-		'fieldtype': 'Date',
-		'hidden': 0,
-		'icon': None,
-		'idx': 20,
-		'in_filter': 1,
-		'label': 'Expected Delivery Date',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03020',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'delivery_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': '160px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:48:02',
-		'default': None,
-		'depends_on': None,
-		'description': 'Track this Sales Order against any Project',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'project_name',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': 1,
-		'label': 'Project Name',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03789',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'project_name',
-		'oldfieldtype': 'Link',
-		'options': 'Project',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': '% of materials delivered against this Sales Order',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'per_delivered',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': 1,
-		'label': '%  Delivered',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03021',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'per_delivered',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': '% of materials billed against this Sales Order',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'per_billed',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': 1,
-		'label': '% Qty Billed',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03022',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'per_billed',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 24,
-		'in_filter': None,
-		'label': 'Amended From',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03025',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': 'The date at which current entry is corrected in the system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'hidden': 1,
-		'icon': None,
-		'idx': 25,
-		'in_filter': None,
-		'label': 'Amendment Date',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03026',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-24 10:15:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'shipping_address_name',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 26,
-		'in_filter': 1,
-		'label': 'Shipping Address Name',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05344',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Address',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-23 14:51:46',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'shipping_address',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 27,
-		'in_filter': 0,
-		'label': 'Shipping Address',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': '000001829',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-03 12:34:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 28,
-		'in_filter': None,
-		'label': 'Items',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05549',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': 'Quotation no against which this Sales Order is made ',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'quotation_no',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 29,
-		'in_filter': 1,
-		'label': 'Quotation No',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03028',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'quotation_no',
-		'oldfieldtype': 'Link',
-		'options': 'Quotation',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'quotation_date',
-		'fieldtype': 'Date',
-		'hidden': 1,
-		'icon': None,
-		'idx': 30,
-		'in_filter': None,
-		'label': 'Quotation Date',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03029',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'quotation_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 31,
-		'in_filter': None,
-		'label': 'Pull Quotation Details',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03030',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'pull_quotation_details',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': 'Select the price list as entered in "Price List" master. This will pull the reference rates of items against this price list as specified in "Item" master.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'price_list_name',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 32,
-		'in_filter': None,
-		'label': 'Price List',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03031',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'price_list_name',
-		'oldfieldtype': 'Select',
-		'options': 'link:Price List',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 33,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05550',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': "Customer's currency",
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'currency',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 34,
-		'in_filter': None,
-		'label': 'Currency',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03023',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'currency',
-		'oldfieldtype': 'Select',
-		'options': 'link:Currency',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:21',
-		'default': '1.00',
-		'depends_on': None,
-		'description': "Rate at which customer's currency is converted to your currency",
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'conversion_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 35,
-		'in_filter': None,
-		'label': 'Conversion Rate',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03024',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'conversion_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 36,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05551',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'sales_order_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 37,
-		'in_filter': None,
-		'label': 'Sales Order Details',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03032',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'sales_order_details',
-		'oldfieldtype': 'Table',
-		'options': 'Sales Order Detail',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '40px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 38,
-		'in_filter': None,
-		'label': 'Clear Table',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03033',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'clear_sales_order_details',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 39,
-		'in_filter': None,
-		'label': 'Re-Calculate Values',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03035',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'net_total',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 40,
-		'in_filter': None,
-		'label': 'Net Total*',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03034',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'net_total',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-03 12:34:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 41,
-		'in_filter': None,
-		'label': 'Note1',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05552',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': 'NOTE : * In Base Currency',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-03 12:34:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 42,
-		'in_filter': None,
-		'label': 'Taxes',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05553',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'charge',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 43,
-		'in_filter': None,
-		'label': 'Select Charges Master',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03038',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'charge',
-		'oldfieldtype': 'Link',
-		'options': 'Other Charges',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 44,
-		'in_filter': None,
-		'label': 'Get Charges',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03039',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'other_charges',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 45,
-		'in_filter': None,
-		'label': 'Other Charges',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03040',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'other_charges',
-		'oldfieldtype': 'Table',
-		'options': 'RV Tax Detail',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 46,
-		'in_filter': None,
-		'label': 'Calculate Charges',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03041',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'other_charges_total',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 47,
-		'in_filter': None,
-		'label': 'Charges Total*',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03042',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'other_charges_total',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'grand_total',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 48,
-		'in_filter': None,
-		'label': 'Grand Total*',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03043',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'grand_total',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 49,
-		'in_filter': None,
-		'label': 'OT Notes',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05554',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': 'NOTE : * In Base Currency',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 50,
-		'in_filter': None,
-		'label': 'Other Charges Calculation',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05555',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-03 12:34:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 51,
-		'in_filter': None,
-		'label': 'Totals',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05556',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'rounded_total',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 52,
-		'in_filter': None,
-		'label': 'Rounded Total',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03068',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'rounded_total',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': 'In Words will be visible once you save the Sales Order.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'in_words',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 53,
-		'in_filter': None,
-		'label': 'In Words',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03069',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'in_words',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '200px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 54,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05557',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'sneha@webnotestech.com',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'grand_total_export',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 55,
-		'in_filter': None,
-		'label': 'Grand Total (Export)',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03071',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'grand_total_export',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'rounded_total_export',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 56,
-		'in_filter': None,
-		'label': 'Rounded Total (Export)',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03072',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'rounded_total_export',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': 'In Words (Export) will be visible once you save the Sales Order.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'in_words_export',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 57,
-		'in_filter': None,
-		'label': 'In Words (Export)',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03073',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'in_words_export',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '200px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-03 12:34:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 58,
-		'in_filter': None,
-		'label': 'Terms',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05558',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'tc_name',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 59,
-		'in_filter': None,
-		'label': 'Select Terms',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03047',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'tc_name',
-		'oldfieldtype': 'Link',
-		'options': 'Term',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 60,
-		'in_filter': None,
-		'label': 'Get Terms',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03048',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'get_tc_details',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 61,
-		'in_filter': None,
-		'label': 'Terms HTML',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05559',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': 'You can add Terms and Notes that will be printed in the Transaction',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'terms',
-		'fieldtype': 'Text Editor',
-		'hidden': None,
-		'icon': None,
-		'idx': 62,
-		'in_filter': None,
-		'label': 'Term Details',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03050',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'terms',
-		'oldfieldtype': 'Text Editor',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-03 12:34:34',
-		'default': None,
-		'depends_on': None,
-		'description': 'Filling in additional information about the Sales Order will help you analyze your data better.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 63,
-		'in_filter': None,
-		'label': 'More Info',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05560',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 64,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05561',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-12-14 10:23:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'letter_head',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 65,
-		'in_filter': None,
-		'label': 'Letter Head',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL04241',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'letter_head',
-		'oldfieldtype': 'Select',
-		'options': 'link:Letter Head',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': 'Select the relevant company name if you have multiple companies.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 66,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03053',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 67,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03054',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'select_print_heading',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 68,
-		'in_filter': None,
-		'label': 'Select Print Heading',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03057',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'select_print_heading',
-		'oldfieldtype': 'Link',
-		'options': 'Print Heading',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 69,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05562',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'source',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 70,
-		'in_filter': None,
-		'label': 'Source',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03055',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'source',
-		'oldfieldtype': 'Select',
-		'options': "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': "eval:doc.source == 'Campaign'",
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'campaign',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 71,
-		'in_filter': None,
-		'label': 'Campaign',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03056',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'campaign',
-		'oldfieldtype': 'Link',
-		'options': 'Campaign',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'note',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 72,
-		'in_filter': None,
-		'label': 'Note',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03065',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'note',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'cancel_reason',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 73,
-		'in_filter': None,
-		'label': 'Cancel Reason',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03063',
-		'no_column': 0,
-		'no_copy': 1,
-		'oldfieldname': 'cancel_reason',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:33',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'delivery_status',
-		'fieldtype': 'Select',
-		'hidden': 1,
-		'icon': None,
-		'idx': 74,
-		'in_filter': None,
-		'label': 'Delivery Status',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05544',
-		'no_column': 0,
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Delivered\nNot Delivered\nPartly Delivered\nClosed\nNot Applicable',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'billing_status',
-		'fieldtype': 'Select',
-		'hidden': 1,
-		'icon': None,
-		'idx': 75,
-		'in_filter': None,
-		'label': 'Billing Status',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05545',
-		'no_column': 0,
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Billed\nNot Billed\nPartly Billed\nClosed',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-03 12:34:34',
-		'default': None,
-		'depends_on': None,
-		'description': 'Display all the individual items delivered with the main items',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': 0,
-		'icon': None,
-		'idx': 76,
-		'in_filter': None,
-		'label': 'Packing List',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05563',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'packing_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 77,
-		'in_filter': None,
-		'label': 'Packing Details',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03075',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'packing_details',
-		'oldfieldtype': 'Table',
-		'options': 'Delivery Note Packing Detail',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 78,
-		'in_filter': None,
-		'label': 'Sales Team',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL05564',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': 'Name as entered in Sales Partner master',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'sales_partner',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 79,
-		'in_filter': 1,
-		'label': 'Sales Partner',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03077',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'sales_partner',
-		'oldfieldtype': 'Link',
-		'options': 'Sales Partner',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'commission_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 80,
-		'in_filter': None,
-		'label': 'Commission Rate',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03078',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'commission_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'total_commission',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 81,
-		'in_filter': None,
-		'label': 'Total Commission',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03079',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'total_commission',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'sales_team',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 82,
-		'in_filter': None,
-		'label': 'Sales Team1',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03080',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'sales_team',
-		'oldfieldtype': 'Table',
-		'options': 'Sales Team',
-		'owner': 'Administrator',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 83,
-		'in_filter': None,
-		'label': 'Repair Sales Order',
-		'modified': '2011-06-27 16:05:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03093',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'repair_sales_order',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Sales Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/crm/doctype/sales_order_detail/sales_order_detail.txt b/crm/doctype/sales_order_detail/sales_order_detail.txt
deleted file mode 100644
index 1eda61a4da..0000000000
--- a/crm/doctype/sales_order_detail/sales_order_detail.txt
+++ /dev/null
@@ -1,1037 +0,0 @@
-[
-	{
-		'_last_update': '1304676470',
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'SOD/.#####',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:22',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': 1,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-06 15:38:39',
-		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'Sales Order Detail',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Tray',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 51
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_code',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': 1,
-		'label': 'Item Code',
-		'modified': '2011-05-06 15:38:39',
-		'modified_by': 'Administrator',
-		'name': 'FL03098',
-		'no_copy': None,
-		'oldfieldname': 'item_code',
-		'oldfieldtype': 'Link',
-		'options': 'Item',
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Item Name',
-		'modified': '2011-05-06 15:38:39',
-		'modified_by': 'Administrator',
-		'name': 'FL03099',
-		'no_copy': None,
-		'oldfieldname': 'item_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': '150'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 0,
-		'label': 'Description',
-		'modified': '2011-05-06 15:38:39',
-		'modified_by': 'Administrator',
-		'name': 'FL03100',
-		'no_copy': None,
-		'oldfieldname': 'description',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 0,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:22',
-		'default': '0.00',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'qty',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Quantity',
-		'modified': '2011-05-06 15:38:39',
-		'modified_by': 'Administrator',
-		'name': 'FL03102',
-		'no_copy': None,
-		'oldfieldname': 'qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'stock_uom',
-		'fieldtype': 'Data',
-		'hidden': 0,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'UOM',
-		'modified': '2011-05-06 15:38:39',
-		'modified_by': 'Administrator',
-		'name': 'FL03101',
-		'no_copy': None,
-		'oldfieldname': 'stock_uom',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '70px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': '0.00',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'ref_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Ref Rate',
-		'modified': '2011-05-06 15:38:39',
-		'modified_by': 'Administrator',
-		'name': 'FL03103',
-		'no_copy': None,
-		'oldfieldname': 'ref_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '70px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': '0.00',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'adj_rate',
-		'fieldtype': 'Float',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Discount(%)',
-		'modified': '2011-05-06 15:38:39',
-		'modified_by': 'Administrator',
-		'name': 'FL03104',
-		'no_copy': None,
-		'oldfieldname': 'adj_rate',
-		'oldfieldtype': 'Float',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '70px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': '0.00',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'export_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Rate',
-		'modified': '2011-05-06 15:38:39',
-		'modified_by': 'Administrator',
-		'name': 'FL03105',
-		'no_copy': None,
-		'oldfieldname': 'export_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': '0.00',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'export_amount',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Amount',
-		'modified': '2011-05-06 15:38:39',
-		'modified_by': 'Administrator',
-		'name': 'FL03106',
-		'no_copy': 0,
-		'oldfieldname': 'export_amount',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'base_ref_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Ref Rate*',
-		'modified': '2011-05-06 15:38:39',
-		'modified_by': 'Administrator',
-		'name': 'FL03107',
-		'no_copy': None,
-		'oldfieldname': 'base_ref_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': '0.00',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'basic_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Basic Rate*',
-		'modified': '2011-05-06 15:38:39',
-		'modified_by': 'Administrator',
-		'name': 'FL03108',
-		'no_copy': None,
-		'oldfieldname': 'basic_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': '0.00',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amount',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Amount*',
-		'modified': '2011-05-06 15:38:39',
-		'modified_by': 'Administrator',
-		'name': 'FL03109',
-		'no_copy': 0,
-		'oldfieldname': 'amount',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'reserved_warehouse',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Reserved Warehouse',
-		'modified': '2011-05-06 15:38:39',
-		'modified_by': 'Administrator',
-		'name': 'FL03110',
-		'no_copy': 1,
-		'oldfieldname': 'reserved_warehouse',
-		'oldfieldtype': 'Link',
-		'options': 'Warehouse',
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': '0.00',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'projected_qty',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Projected Qty',
-		'modified': '2011-05-06 15:38:40',
-		'modified_by': 'Administrator',
-		'name': 'FL03111',
-		'no_copy': 1,
-		'oldfieldname': 'projected_qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '70px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-01-28 11:15:20',
-		'default': '0.00',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'actual_qty',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Actual Qty',
-		'modified': '2011-05-06 15:38:40',
-		'modified_by': 'Administrator',
-		'name': 'FL04493',
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '70px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': '0.00',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'delivered_qty',
-		'fieldtype': 'Currency',
-		'hidden': 0,
-		'icon': None,
-		'idx': 16,
-		'in_filter': 0,
-		'label': 'Delivered Qty',
-		'modified': '2011-05-06 15:38:40',
-		'modified_by': 'Administrator',
-		'name': 'FL03112',
-		'no_copy': 1,
-		'oldfieldname': 'delivered_qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'billed_qty',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': 0,
-		'label': 'Billed Qty',
-		'modified': '2011-05-06 15:38:40',
-		'modified_by': 'Administrator',
-		'name': 'FL03113',
-		'no_copy': 1,
-		'oldfieldname': 'billed_qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-05 17:16:48',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'billed_amt',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Billed Amt',
-		'modified': '2011-05-06 15:38:40',
-		'modified_by': 'Administrator',
-		'name': 'FL04748',
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': 'For Production',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'planned_qty',
-		'fieldtype': 'Currency',
-		'hidden': 1,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Planned Quantity',
-		'modified': '2011-05-06 15:38:40',
-		'modified_by': 'Administrator',
-		'name': 'FL03114',
-		'no_copy': 1,
-		'oldfieldname': 'planned_qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': 'For Production',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'produced_qty',
-		'fieldtype': 'Currency',
-		'hidden': 1,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'Produced Quantity',
-		'modified': '2011-05-06 15:38:40',
-		'modified_by': 'Administrator',
-		'name': 'FL03115',
-		'no_copy': None,
-		'oldfieldname': 'produced_qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'brand',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': 1,
-		'label': 'Brand Name',
-		'modified': '2011-05-06 15:38:40',
-		'modified_by': 'Administrator',
-		'name': 'FL03116',
-		'no_copy': None,
-		'oldfieldname': 'brand',
-		'oldfieldtype': 'Link',
-		'options': 'Brand',
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_group',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': 1,
-		'label': 'Item Group',
-		'modified': '2011-05-06 15:38:40',
-		'modified_by': 'Administrator',
-		'name': 'FL03117',
-		'no_copy': None,
-		'oldfieldname': 'item_group',
-		'oldfieldtype': 'Link',
-		'options': 'Item Group',
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'prevdoc_docname',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 23,
-		'in_filter': 1,
-		'label': 'Quotation No.',
-		'modified': '2011-05-06 15:38:40',
-		'modified_by': 'Administrator',
-		'name': 'FL03118',
-		'no_copy': None,
-		'oldfieldname': 'prevdoc_docname',
-		'oldfieldtype': 'Link',
-		'options': 'Quotation',
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'page_break',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 24,
-		'in_filter': None,
-		'label': 'Page Break',
-		'modified': '2011-05-06 15:38:40',
-		'modified_by': 'Administrator',
-		'name': 'FL03120',
-		'no_copy': None,
-		'oldfieldname': 'page_break',
-		'oldfieldtype': 'Check',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': 'required for production. will be used later.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'delivery_date',
-		'fieldtype': 'Date',
-		'hidden': 0,
-		'icon': None,
-		'idx': 25,
-		'in_filter': None,
-		'label': 'Expected Delivery Date',
-		'modified': '2011-05-06 15:38:40',
-		'modified_by': 'Administrator',
-		'name': 'FL03122',
-		'no_copy': None,
-		'oldfieldname': 'delivery_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': 'required for production. will be used later.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'confirmation_date',
-		'fieldtype': 'Date',
-		'hidden': 0,
-		'icon': None,
-		'idx': 26,
-		'in_filter': 1,
-		'label': 'Confirmed Delivery Date',
-		'modified': '2011-05-06 15:38:40',
-		'modified_by': 'Administrator',
-		'name': 'FL03123',
-		'no_copy': None,
-		'oldfieldname': 'confirmation_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_tax_rate',
-		'fieldtype': 'Small Text',
-		'hidden': 1,
-		'icon': None,
-		'idx': 27,
-		'in_filter': None,
-		'label': 'Item Tax Rate',
-		'modified': '2011-05-06 15:38:40',
-		'modified_by': 'Administrator',
-		'name': 'FL03119',
-		'no_copy': None,
-		'oldfieldname': 'item_tax_rate',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': 'The date at which current entry is made in system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'transaction_date',
-		'fieldtype': 'Date',
-		'hidden': 1,
-		'icon': None,
-		'idx': 28,
-		'in_filter': 0,
-		'label': 'Sales Order Date',
-		'modified': '2011-05-06 15:38:40',
-		'modified_by': 'Administrator',
-		'name': 'FL03121',
-		'no_copy': None,
-		'oldfieldname': 'transaction_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Order Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/crm/doctype/sales_team/sales_team.txt b/crm/doctype/sales_team/sales_team.txt
deleted file mode 100644
index 0ae2eb677e..0000000000
--- a/crm/doctype/sales_team/sales_team.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-03-16 18:21:56', 'search_fields': None, 'module': 'CRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 7, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': '', 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': '', 'name': 'Sales Team', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-11-24 09:09:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': '', 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-16 18:21:56', 'doctype': 'DocField', 'oldfieldname': 'sales_person', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Sales Person', 'width': '200px', 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Sales Team', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01421', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-11-24 09:09:57', 'parenttype': 'DocType', 'fieldname': 'sales_person', 'fieldtype': 'Link', 'options': 'Sales Person', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-01-27 09:44:18', 'doctype': 'DocField', 'oldfieldname': 'contact_no', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Contact No.', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Sales Team', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03680', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-11-24 09:09:57', 'parenttype': 'DocType', 'fieldname': 'contact_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-16 18:21:56', 'doctype': 'DocField', 'oldfieldname': 'allocated_percentage', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Allocated (%)', 'width': '100px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Sales Team', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01422', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-11-24 09:09:57', 'parenttype': 'DocType', 'fieldname': 'allocated_percentage', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-16 18:21:56', 'doctype': 'DocField', 'oldfieldname': 'allocated_amount', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Allocated Amount', 'width': '120px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Sales Team', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01423', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-11-24 09:09:57', 'parenttype': 'DocType', 'fieldname': 'allocated_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-05-26 17:32:54', 'doctype': 'DocField', 'oldfieldname': 'parenttype', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'saumil@webnotestech.com', 'label': 'Parenttype', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Sales Team', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02191', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-11-24 09:09:57', 'parenttype': 'DocType', 'fieldname': 'parenttype', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-07-20 13:14:29', 'doctype': 'DocField', 'oldfieldname': 'incentives', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Incentives', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Sales Team', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05663', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-11-24 09:09:57', 'parenttype': 'DocType', 'fieldname': 'incentives', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/crm/doctype/shipping_address/shipping_address.txt b/crm/doctype/shipping_address/shipping_address.txt
deleted file mode 100755
index c059bbd121..0000000000
--- a/crm/doctype/shipping_address/shipping_address.txt
+++ /dev/null
@@ -1,406 +0,0 @@
-[
-	{
-		'_last_update': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': 1,
-		'autoname': 'SA.#####',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-09 11:01:06',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-03-24 10:39:09',
-		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'Shipping Address',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'customer, ship_to, shipping_address',
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': None,
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 8
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:01:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-09 11:01:06',
-		'modified_by': 'Administrator',
-		'name': '000000259',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Shipping Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:01:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Customer',
-		'modified': '2011-05-09 11:01:06',
-		'modified_by': 'Administrator',
-		'name': '000000260',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Customer',
-		'owner': 'Administrator',
-		'parent': 'Shipping Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:01:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Customer Name',
-		'modified': '2011-05-09 11:01:06',
-		'modified_by': 'Administrator',
-		'name': '000000261',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Shipping Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:01:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_address',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Customer Address',
-		'modified': '2011-05-09 11:01:06',
-		'modified_by': 'Administrator',
-		'name': '000000262',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Shipping Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:01:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'ship_to',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Ship To',
-		'modified': '2011-05-09 11:01:06',
-		'modified_by': 'Administrator',
-		'name': '000000263',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Shipping Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:01:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'shipping_address',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Shipping Address',
-		'modified': '2011-05-09 11:01:06',
-		'modified_by': 'Administrator',
-		'name': '000000264',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Shipping Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:01:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-09 11:01:07',
-		'modified_by': 'Administrator',
-		'name': '000000265',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Shipping Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:01:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_primary_address',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Is Primary Address',
-		'modified': '2011-05-09 11:01:07',
-		'modified_by': 'Administrator',
-		'name': '000000266',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Yes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Shipping Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:01:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'shipping_details',
-		'fieldtype': 'Text Editor',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Shipping Details',
-		'modified': '2011-05-09 11:01:07',
-		'modified_by': 'Administrator',
-		'name': '000000267',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Shipping Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:01:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'trash_reason',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Trash Reason',
-		'modified': '2011-05-09 11:01:07',
-		'modified_by': 'Administrator',
-		'name': '000000268',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Shipping Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/crm/doctype/sms_center/sms_center.txt b/crm/doctype/sms_center/sms_center.txt
deleted file mode 100644
index 23e379f9d0..0000000000
--- a/crm/doctype/sms_center/sms_center.txt
+++ /dev/null
@@ -1,486 +0,0 @@
-[
-	{
-		'allow_attach': 0,
-		'allow_copy': 1,
-		'allow_email': 1,
-		'allow_print': 1,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:24',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': 0,
-		'hide_toolbar': 0,
-		'idx': None,
-		'in_create': 0,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': 1,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': 4,
-		'modified': '2011-02-15 17:06:33',
-		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'SMS Center',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': 1,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 1,
-		'smallicon': None,
-		'use_template': None,
-		'version': 36
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-08-08 17:09:24',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-02-15 17:06:33',
-		'modified_by': 'Administrator',
-		'name': 'PERM00532',
-		'owner': 'Administrator',
-		'parent': 'SMS Center',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 0,
-		'creation': '2010-08-08 17:09:24',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-02-15 17:06:33',
-		'modified_by': 'Administrator',
-		'name': 'PERM00533',
-		'owner': 'Administrator',
-		'parent': 'SMS Center',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
-		'write': 0
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-15 16:59:29',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'column_break1',
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-02-15 17:06:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04772',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'SMS Center',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:24',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'send_to',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Send To',
-		'modified': '2011-02-15 17:06:33',
-		'modified_by': 'Administrator',
-		'name': 'FL03352',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': '\nAll Contact\nAll Customer Contact\nAll Supplier Contact\nAll Sales Partner Contact\nAll Lead (Open)\nAll Employee (Active)\nAll Sales Person',
-		'owner': 'Administrator',
-		'parent': 'SMS Center',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:24',
-		'default': None,
-		'depends_on': "eval:doc.send_to=='All Customer Contact'",
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Customer',
-		'modified': '2011-02-15 17:06:33',
-		'modified_by': 'Administrator',
-		'name': 'FL03353',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Customer',
-		'owner': 'Administrator',
-		'parent': 'SMS Center',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-01-11 15:10:58',
-		'default': None,
-		'depends_on': "eval:doc.send_to=='All Supplier Contact'",
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Supplier',
-		'modified': '2011-02-15 17:06:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04407',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Supplier',
-		'owner': 'Administrator',
-		'parent': 'SMS Center',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-01-11 15:10:58',
-		'default': None,
-		'depends_on': "eval:doc.send_to=='All Employee (Active)'",
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'department',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Department',
-		'modified': '2011-02-15 17:06:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04409',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'link:Department',
-		'owner': 'Administrator',
-		'parent': 'SMS Center',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-01-11 15:10:58',
-		'default': None,
-		'depends_on': "eval:doc.send_to=='All Employee (Active)'",
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'branch',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Branch',
-		'modified': '2011-02-15 17:06:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04408',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'link:Branch',
-		'owner': 'Administrator',
-		'parent': 'SMS Center',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-01-11 16:55:50',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Create Receiver List',
-		'modified': '2011-02-15 17:06:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04411',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'create_receiver_list',
-		'owner': 'Administrator',
-		'parent': 'SMS Center',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:24',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'receiver_list',
-		'fieldtype': 'Code',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Receiver List',
-		'modified': '2011-02-15 17:06:33',
-		'modified_by': 'Administrator',
-		'name': 'FL03359',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'SMS Center',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-15 16:59:29',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'column_break2',
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-02-15 17:06:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04773',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'SMS Center',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:24',
-		'default': None,
-		'depends_on': None,
-		'description': 'Message greater than 160 character will be splitted into multiple mesage',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'message',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Message',
-		'modified': '2011-02-15 17:06:33',
-		'modified_by': 'Administrator',
-		'name': 'FL03354',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'SMS Center',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:24',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Send SMS',
-		'modified': '2011-02-15 17:06:33',
-		'modified_by': 'Administrator',
-		'name': 'FL03357',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'send_sms',
-		'owner': 'Administrator',
-		'parent': 'SMS Center',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/crm/page/sales_browser/sales_browser.txt b/crm/page/sales_browser/sales_browser.txt
deleted file mode 100644
index bdeb236b6b..0000000000
--- a/crm/page/sales_browser/sales_browser.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'creation': '2010-06-16 11:44:38', 'module': 'CRM', 'doctype': 'Page', 'owner': 'Administrator', 'style': None, 'modified_by': 'Administrator', 'script': None, 'show_in_menu': 0, 'content': None, 'page_name': 'Sales Browser', 'menu_index': None, 'docstatus': 0, 'parent': None, 'standard': 'Yes', 'icon': None, 'name': 'Sales Browser', 'idx': None, 'static_content': None, 'modified': '2010-11-10 19:21:50', 'parenttype': None, 'parent_node': None, 'parentfield': None}, {'modified_by': 'Administrator', 'name': 'PR000140', 'parent': 'Sales Browser', 'creation': '2010-06-16 12:08:31', 'modified': '2010-11-10 19:21:50', 'doctype': 'Page Role', 'idx': 1, 'parenttype': 'Page', 'role': 'Sales Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': 'roles'}, {'modified_by': 'Administrator', 'name': 'PR000149', 'parent': 'Sales Browser', 'creation': '2010-07-14 15:57:09', 'modified': '2010-11-10 19:21:50', 'doctype': 'Page Role', 'idx': 2, 'parenttype': 'Page', 'role': 'Material Master Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'parentfield': 'roles'}]
\ No newline at end of file
diff --git a/crm/page/sales_dashboard/sales_dashboard.txt b/crm/page/sales_dashboard/sales_dashboard.txt
deleted file mode 100644
index c08615ab1e..0000000000
--- a/crm/page/sales_dashboard/sales_dashboard.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'creation': '2010-05-21 13:56:25', 'module': 'CRM', 'doctype': 'Page', 'owner': 'harshada@webnotestech.com', 'style': None, 'modified_by': 'saumil@webnotestech.com', 'script': None, 'show_in_menu': 0, 'content': None, 'page_name': 'Sales Dashboard', 'menu_index': None, 'docstatus': 0, 'parent': None, 'standard': 'Yes', 'icon': None, 'name': 'Sales Dashboard', 'idx': None, 'static_content': None, 'modified': '2010-09-25 00:00:00', 'parenttype': None, 'parent_node': None, 'parentfield': None}, {'modified_by': 'saumil@webnotestech.com', 'name': 'PR000136', 'parent': 'Sales Dashboard', 'creation': '2010-05-21 13:56:25', 'modified': '2010-08-08 00:01:08', 'doctype': 'Page Role', 'idx': 1, 'parenttype': 'Page', 'role': 'Sales Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'parentfield': 'roles'}]
\ No newline at end of file
diff --git a/crm/search_criteria/so_pending_items_3/so_pending_items_3.txt b/crm/search_criteria/so_pending_items_3/so_pending_items_3.txt
deleted file mode 100644
index 43cdc8df94..0000000000
--- a/crm/search_criteria/so_pending_items_3/so_pending_items_3.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Sales Order\x01ID,Sales Order\x01Sales Order Date,Sales Order\x01Customer,Sales Order\x01Customer Name,Sales Order Detail\x01Item Code,Sales Order Detail\x01Item Name,Sales Order Detail\x01Description,Sales Order Detail\x01Quantity,Sales Order Detail\x01Delivered Qty,Sales Order Detail\x01Billed Qty',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'SO Pending items 3',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Sales Order Detail',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Order\x01Submitted':1,'Sales Order\x01Status':'Submitted','Sales Order\x01Company':'Alpha Company','Sales Order\x01Fiscal Year':'2010-2011'}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-11-20 16:20:50',
-		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'so_pending_items_3',
-		'owner': 'harshada@webnotestech.com',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': 'Sales Order',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
-		'sort_by': '`tabSales Order`.`name`',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/home/doctype/company_control/company_control.txt b/home/doctype/company_control/company_control.txt
index 9ec6fe31b1..b11c7da897 100644
--- a/home/doctype/company_control/company_control.txt
+++ b/home/doctype/company_control/company_control.txt
@@ -1,58 +1,31 @@
+# DocType, Company Control
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': '',
-		'client_string': None,
-		'colour': 'White:FFF',
 		'creation': '2010-08-08 17:08:55',
-		'description': None,
 		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': 1,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2010-11-17 16:25:34',
+		'modified': '2011-01-13 12:14:36',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
 		'module': 'Home',
-		'name': 'Company Control',
-		'name_case': '',
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': '',
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
+		'name': '__common__',
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
+		'server_code': '\n\n\t# Update roles of given user\n\tdef update_roles(self,arg):\n\t\targ = eval(arg)\n\t\tsql("delete from `tabUserRole` where parenttype=\'Profile\' and parent =\'%s\'" % (cstr(arg[\'usr\'])))\n\t\trole_list = arg[\'role_list\'].split(\',\')\n\t\tmsgprint(sql("select role from tabUserRole where parent = \'%s\'" % cstr(arg[\'usr\'])))\n\t\tmsgprint(role_list)\n\t\tfor r in role_list:\n\t\t\tpr=Document(\'UserRole\')\n\t\t\tpr.parent = arg[\'usr\']\n\t\t\tpr.parenttype = \'Profile\'\n\t\t\tpr.role = r\n\t\t\tpr.parentfield = \'userroles\'\n\t\t\tpr.save(1)\n\t\tmsgprint(sql("select role from tabUserRole where parent = \'%s\'" % cstr(arg[\'usr\'])))\n\n\n  # Create New Profile\n  # ====================\n\tdef create_new_profile(self, arg):\n\t\tp = Document(\'Profile\')\n\t\tp.first_name = arg.get(\'first_name\') or arg.get(\'email_id\')\n\t\tp.last_name = arg.get(\'last_name\')\n\t\tp.email = arg.get(\'email_id\')\n\t\tp.name = arg.get(\'email_id\')\n\t\tp.user_type = arg.get(\'user_type\') or \'System User\'\n\t\tp.enabled = 0\t\n\t\tp.save(new=1)\n\t\tp_obj = get_obj(\'Profile\', p.name)\n\t\tp_obj.on_update()',
 		'server_code_error': ' ',
-		'show_in_menu': None,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
-		'version': 7
+		'version': 13
+	},
+
+	# DocType, Company Control
+	{
+		'doctype': 'DocType',
+		'name': 'Company Control'
 	}
 ]
\ No newline at end of file
diff --git a/home/doctype/feed/feed.txt b/home/doctype/feed/feed.txt
index abf306d5dc..5aa4f910e4 100644
--- a/home/doctype/feed/feed.txt
+++ b/home/doctype/feed/feed.txt
@@ -1,202 +1,73 @@
+# DocType, Feed
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': '_FEED.#####',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2011-04-06 18:07:23',
-		'description': None,
+		'creation': '2011-04-08 10:50:41',
 		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-06-09 16:42:12',
+		'modified': '2011-04-05 09:16:57',
 		'modified_by': 'Administrator',
-		'module': 'Home',
-		'name': 'Feed',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': None,
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
-		'version': 2
+		'owner': 'Administrator'
 	},
+
+	# These values are common for all DocType
+	{
+		'autoname': '_FEED.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'Home',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'version': 1
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Data',
+		'name': '__common__',
+		'parent': 'Feed',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Feed
+	{
+		'doctype': 'DocType',
+		'name': 'Feed'
+	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 18:07:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'doc_type',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 1,
-		'in_filter': None,
-		'label': 'Doc Type',
-		'modified': '2011-06-09 16:42:12',
-		'modified_by': 'Administrator',
-		'name': '000000498',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Feed',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Doc Type'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 18:07:24',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'doc_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
-		'in_filter': None,
-		'label': 'Doc Name',
-		'modified': '2011-06-09 16:42:12',
-		'modified_by': 'Administrator',
-		'name': '000000499',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Feed',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Doc Name'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 18:07:24',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'subject',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
-		'in_filter': None,
-		'label': 'Subject',
-		'modified': '2011-06-09 16:42:12',
-		'modified_by': 'Administrator',
-		'name': '000000500',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Feed',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Subject'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 18:07:24',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'color',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 4,
-		'in_filter': None,
-		'label': 'Color',
-		'modified': '2011-06-09 16:42:12',
-		'modified_by': 'Administrator',
-		'name': '000000501',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Feed',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Color'
 	}
 ]
\ No newline at end of file
diff --git a/home/doctype/home_control/home_control.py b/home/doctype/home_control/home_control.py
index 213a35d36f..1f58a5e236 100644
--- a/home/doctype/home_control/home_control.py
+++ b/home/doctype/home_control/home_control.py
@@ -287,7 +287,7 @@ class DocType:
 	# module settings
 	# -------------------------------------------------------------------------------------------------------
 	def get_module_order(self):
-		show_list = ['Event Updates','My Company','Setup','Accounts','CRM','SRM','Maintenance','Material Management','Payroll','Projects','Analysis','Production']
+		show_list = ['Home','Setup','Accounts','Selling','Buying','Support','Stock','HR','Projects','Analysis','Production']
 		ml = filter(lambda x: x[0] in show_list, \
 			sql("select name, module_label, module_seq, is_hidden from `tabModule Def` where docstatus<2 order by module_seq asc, module_label asc"))
 		return convert_to_lists(ml)
diff --git a/home/doctype/home_control/home_control.txt b/home/doctype/home_control/home_control.txt
index 4113a6135e..fff9743f95 100644
--- a/home/doctype/home_control/home_control.txt
+++ b/home/doctype/home_control/home_control.txt
@@ -1,81 +1,55 @@
+# DocType, Home Control
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': '',
-		'client_string': None,
-		'colour': 'White:FFF',
 		'creation': '2009-07-09 16:32:49',
-		'description': None,
 		'docstatus': 0,
+		'modified': '2010-12-24 17:08:55',
+		'modified_by': 'nabin@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
 		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
 		'issingle': 1,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-06-09 16:42:37',
-		'modified_by': 'Administrator',
 		'module': 'Home',
-		'name': 'Home Control',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
+		'name': '__common__',
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
-		'version': 4
+		'version': 6
 	},
+
+	# These values are common for all DocPerm
 	{
-		'amend': None,
-		'cancel': None,
 		'create': 1,
-		'creation': '2010-10-19 13:01:06',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-06-09 16:42:37',
-		'modified_by': 'Administrator',
-		'name': 'PERM00716',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'parent': 'Home Control',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
 		'permlevel': 0,
 		'read': 1,
 		'role': 'Guest',
-		'submit': None,
 		'write': 1
+	},
+
+	# DocType, Home Control
+	{
+		'doctype': 'DocType',
+		'name': 'Home Control'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
 	}
 ]
\ No newline at end of file
diff --git a/home/doctype/widget_control/widget_control.txt b/home/doctype/widget_control/widget_control.txt
index 638032082b..1b6e6061e0 100644
--- a/home/doctype/widget_control/widget_control.txt
+++ b/home/doctype/widget_control/widget_control.txt
@@ -1,58 +1,32 @@
+# DocType, Widget Control
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': '',
-		'client_string': None,
-		'colour': 'White:FFF',
 		'creation': '2010-08-08 17:09:30',
-		'description': None,
 		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
 		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
 		'issingle': 1,
 		'istable': 0,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-06-09 16:44:21',
-		'modified_by': 'Administrator',
 		'module': 'Home',
-		'name': 'Widget Control',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
+		'name': '__common__',
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
-		'version': 28
+		'version': 27
+	},
+
+	# DocType, Widget Control
+	{
+		'doctype': 'DocType',
+		'name': 'Widget Control'
 	}
 ]
\ No newline at end of file
diff --git a/home/page/event_updates/event_updates.txt b/home/page/event_updates/event_updates.txt
index d35b75945c..21d9350033 100644
--- a/home/page/event_updates/event_updates.txt
+++ b/home/page/event_updates/event_updates.txt
@@ -1,36 +1,27 @@
+# Page, Event Updates
 [
+
+	# These values are common in all dictionaries
 	{
-		'author': None,
-		'category': None,
-		'content': None,
-		'creation': '2010-12-14 10:33:09',
+		'creation': '2010-12-14 10:23:23',
 		'docstatus': 0,
-		'doctype': 'Page',
-		'file_list': None,
-		'icon': None,
-		'idx': None,
-		'keywords': None,
-		'menu_index': None,
-		'modified': '2010-12-23 11:48:49',
+		'modified': '2010-12-27 10:58:56',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
 		'module': 'Home',
-		'name': 'Event Updates',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_name': 'Event Updates',
-		'page_title': None,
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'publish': None,
-		'script': None,
-		'show_in_menu': None,
-		'site_description': None,
-		'standard': 'Yes',
-		'static_content': None,
-		'style': None,
-		'stylesheet': None,
-		'template': None,
-		'write_content': None
+		'standard': 'Yes'
+	},
+
+	# Page, Event Updates
+	{
+		'doctype': 'Page',
+		'name': 'Event Updates'
 	}
 ]
\ No newline at end of file
diff --git a/home/page/my_company/my_company.py b/home/page/my_company/my_company.py
index cbdb8fced8..2d47cbc20f 100644
--- a/home/page/my_company/my_company.py
+++ b/home/page/my_company/my_company.py
@@ -108,7 +108,7 @@ def post_comment(arg):
 			fn = webnotes.user.name
 
 		from webnotes.utils.email_lib import sendmail
-		from settings.doctype.notification_control.notification_control import get_formatted_message
+		from setup.doctype.notification_control.notification_control import get_formatted_message
 		
 		message = '''A new comment has been posted on your page by %s:
 		
diff --git a/home/page/my_company/my_company.txt b/home/page/my_company/my_company.txt
index 61aed51750..3183315581 100644
--- a/home/page/my_company/my_company.txt
+++ b/home/page/my_company/my_company.txt
@@ -1,64 +1,51 @@
+# Page, My Company
 [
+
+	# These values are common in all dictionaries
 	{
-		'author': None,
-		'category': None,
-		'content': '',
-		'creation': '2010-12-14 10:33:09',
+		'creation': '2010-12-14 10:23:19',
 		'docstatus': 0,
-		'doctype': 'Page',
-		'file_list': None,
-		'icon': None,
-		'idx': None,
-		'keywords': None,
-		'menu_index': None,
-		'modified': '2010-12-01 17:09:46',
+		'modified': '2010-12-27 17:44:15',
 		'modified_by': 'Administrator',
-		'module': 'Home',
-		'name': 'My Company',
-		'owner': 'Administrator',
-		'page_name': 'My Company',
-		'page_title': None,
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'publish': None,
-		'script': None,
-		'show_in_menu': 1,
-		'site_description': None,
-		'standard': 'Yes',
-		'static_content': '',
-		'style': '',
-		'stylesheet': None,
-		'template': None,
-		'write_content': None
+		'owner': 'Administrator'
 	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
+		'module': 'Home',
+		'name': '__common__',
+		'page_name': 'My Company',
+		'show_in_menu': 1,
+		'standard': 'Yes'
+	},
+
+	# These values are common for all Page Role
+	{
+		'doctype': 'Page Role',
+		'name': '__common__',
+		'parent': 'My Company',
+		'parentfield': 'roles',
+		'parenttype': 'Page'
+	},
+
+	# Page, My Company
+	{
+		'doctype': 'Page',
+		'name': 'My Company'
+	},
+
+	# Page Role
 	{
-		'creation': '2010-12-14 10:33:09',
-		'docstatus': 0,
 		'doctype': 'Page Role',
 		'idx': 1,
-		'modified': '2010-12-14 10:33:09',
-		'modified_by': 'Administrator',
-		'name': 'PR000235',
-		'owner': 'Administrator',
-		'parent': 'My Company',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
 		'role': 'Administrator'
 	},
+
+	# Page Role
 	{
-		'creation': '2010-12-14 10:33:09',
-		'docstatus': 0,
 		'doctype': 'Page Role',
 		'idx': 2,
-		'modified': '2010-12-14 10:33:09',
-		'modified_by': 'Administrator',
-		'name': 'PR000236',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'My Company',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
 		'role': 'All'
 	}
 ]
\ No newline at end of file
diff --git a/home/page/profile_settings/profile_settings.txt b/home/page/profile_settings/profile_settings.txt
index 2bd11e0658..25fe1463ad 100644
--- a/home/page/profile_settings/profile_settings.txt
+++ b/home/page/profile_settings/profile_settings.txt
@@ -1,36 +1,27 @@
+# Page, profile-settings
 [
+
+	# These values are common in all dictionaries
 	{
-		'author': None,
-		'category': 'Standard',
-		'content': None,
-		'creation': '2011-04-13 12:08:59',
+		'creation': '2011-04-18 10:19:10',
 		'docstatus': 0,
-		'doctype': 'Page',
-		'file_list': None,
-		'icon': None,
-		'idx': None,
-		'keywords': None,
-		'menu_index': None,
 		'modified': '2011-04-13 12:08:59',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
 		'module': 'Home',
-		'name': 'profile-settings',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_name': 'Profile Settings',
-		'page_title': None,
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'publish': None,
-		'script': None,
-		'show_in_menu': None,
-		'site_description': None,
-		'standard': 'Yes',
-		'static_content': None,
-		'style': None,
-		'stylesheet': None,
-		'template': None,
-		'write_content': None
+		'standard': 'Yes'
+	},
+
+	# Page, profile-settings
+	{
+		'doctype': 'Page',
+		'name': 'profile-settings'
 	}
 ]
\ No newline at end of file
diff --git a/payroll/Deduction Type/Income Tax/Income Tax.txt b/hr/Deduction Type/Income Tax/Income Tax.txt
similarity index 100%
rename from payroll/Deduction Type/Income Tax/Income Tax.txt
rename to hr/Deduction Type/Income Tax/Income Tax.txt
diff --git a/payroll/Deduction Type/Professional Tax/Professional Tax.txt b/hr/Deduction Type/Professional Tax/Professional Tax.txt
similarity index 100%
rename from payroll/Deduction Type/Professional Tax/Professional Tax.txt
rename to hr/Deduction Type/Professional Tax/Professional Tax.txt
diff --git a/payroll/Deduction Type/Provident Fund/Provident Fund.txt b/hr/Deduction Type/Provident Fund/Provident Fund.txt
similarity index 100%
rename from payroll/Deduction Type/Provident Fund/Provident Fund.txt
rename to hr/Deduction Type/Provident Fund/Provident Fund.txt
diff --git a/mapper/DocType Mapper/KRA Template-Appraisal/KRA Template-Appraisal.txt b/hr/DocType Mapper/KRA Template-Appraisal/KRA Template-Appraisal.txt
similarity index 100%
rename from mapper/DocType Mapper/KRA Template-Appraisal/KRA Template-Appraisal.txt
rename to hr/DocType Mapper/KRA Template-Appraisal/KRA Template-Appraisal.txt
diff --git a/mapper/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt b/hr/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt
similarity index 100%
rename from mapper/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt
rename to hr/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt
diff --git a/payroll/Earning Type/Basic/Basic.txt b/hr/Earning Type/Basic/Basic.txt
similarity index 100%
rename from payroll/Earning Type/Basic/Basic.txt
rename to hr/Earning Type/Basic/Basic.txt
diff --git a/payroll/Earning Type/House Rent Allowance/House Rent Allowance.txt b/hr/Earning Type/House Rent Allowance/House Rent Allowance.txt
similarity index 100%
rename from payroll/Earning Type/House Rent Allowance/House Rent Allowance.txt
rename to hr/Earning Type/House Rent Allowance/House Rent Allowance.txt
diff --git a/payroll/Expense Type/Calls/Calls.txt b/hr/Expense Type/Calls/Calls.txt
similarity index 100%
rename from payroll/Expense Type/Calls/Calls.txt
rename to hr/Expense Type/Calls/Calls.txt
diff --git a/payroll/Expense Type/Food/Food.txt b/hr/Expense Type/Food/Food.txt
similarity index 100%
rename from payroll/Expense Type/Food/Food.txt
rename to hr/Expense Type/Food/Food.txt
diff --git a/payroll/Expense Type/Medical/Medical.txt b/hr/Expense Type/Medical/Medical.txt
similarity index 100%
rename from payroll/Expense Type/Medical/Medical.txt
rename to hr/Expense Type/Medical/Medical.txt
diff --git a/payroll/Expense Type/Others/Others.txt b/hr/Expense Type/Others/Others.txt
similarity index 100%
rename from payroll/Expense Type/Others/Others.txt
rename to hr/Expense Type/Others/Others.txt
diff --git a/payroll/Expense Type/Travel/Travel.txt b/hr/Expense Type/Travel/Travel.txt
similarity index 100%
rename from payroll/Expense Type/Travel/Travel.txt
rename to hr/Expense Type/Travel/Travel.txt
diff --git a/payroll/Leave Type/Casual Leave/Casual Leave.txt b/hr/Leave Type/Casual Leave/Casual Leave.txt
similarity index 100%
rename from payroll/Leave Type/Casual Leave/Casual Leave.txt
rename to hr/Leave Type/Casual Leave/Casual Leave.txt
diff --git a/payroll/Leave Type/Compensatory Off/Compensatory Off.txt b/hr/Leave Type/Compensatory Off/Compensatory Off.txt
similarity index 100%
rename from payroll/Leave Type/Compensatory Off/Compensatory Off.txt
rename to hr/Leave Type/Compensatory Off/Compensatory Off.txt
diff --git a/payroll/Leave Type/Leave Without Pay/Leave Without Pay.txt b/hr/Leave Type/Leave Without Pay/Leave Without Pay.txt
similarity index 100%
rename from payroll/Leave Type/Leave Without Pay/Leave Without Pay.txt
rename to hr/Leave Type/Leave Without Pay/Leave Without Pay.txt
diff --git a/payroll/Leave Type/Privilege Leave/Privilege Leave.txt b/hr/Leave Type/Privilege Leave/Privilege Leave.txt
similarity index 100%
rename from payroll/Leave Type/Privilege Leave/Privilege Leave.txt
rename to hr/Leave Type/Privilege Leave/Privilege Leave.txt
diff --git a/payroll/Leave Type/Sick Leave/Sick Leave.txt b/hr/Leave Type/Sick Leave/Sick Leave.txt
similarity index 100%
rename from payroll/Leave Type/Sick Leave/Sick Leave.txt
rename to hr/Leave Type/Sick Leave/Sick Leave.txt
diff --git a/payroll/Module Def/Payroll/Payroll.txt b/hr/Module Def/HR/HR.txt
similarity index 68%
rename from payroll/Module Def/Payroll/Payroll.txt
rename to hr/Module Def/HR/HR.txt
index f7202e6d0b..5ad5e54194 100644
--- a/payroll/Module Def/Payroll/Payroll.txt	
+++ b/hr/Module Def/HR/HR.txt	
@@ -1,24 +1,24 @@
 [
 	{
 		'_last_update': None,
-		'creation': '2010-11-30 22:42:05',
+		'creation': '2011-06-30 15:51:33',
 		'disabled': 'No',
 		'docstatus': 0,
-		'doctype': 'Module Def',
+		'doctype': u'Module Def',
 		'doctype_list': None,
 		'file_list': None,
 		'idx': None,
 		'is_hidden': 'No',
-		'last_updated_date': '2011-02-14 12:07:27',
-		'modified': '2011-02-17 12:00:37',
+		'last_updated_date': None,
+		'modified': '2011-06-30 15:51:33',
 		'modified_by': 'Administrator',
 		'module_desc': 'Human Resource Management - Employee Database, Salaries etc.',
 		'module_icon': 'HR.gif',
 		'module_label': 'HR',
-		'module_name': 'Payroll',
+		'module_name': 'HR',
 		'module_page': None,
 		'module_seq': 9,
-		'name': 'Payroll',
+		'name': 'HR',
 		'owner': 'Administrator',
 		'parent': None,
 		'parentfield': None,
@@ -28,7 +28,7 @@
 	},
 	{
 		'click_function': None,
-		'creation': '2010-11-30 22:42:05',
+		'creation': '2011-06-30 15:51:33',
 		'description': 'Your Employee Database',
 		'display_name': 'Employee',
 		'doc_name': 'Employee',
@@ -39,17 +39,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 1,
-		'modified': '2011-03-24 15:04:46',
+		'modified': '2011-06-30 15:51:33',
 		'modified_by': 'Administrator',
-		'name': 'MDI00183',
+		'name': 'MDI01335',
 		'owner': 'Administrator',
-		'parent': 'Payroll',
+		'parent': 'HR',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-11-30 22:42:05',
+		'creation': '2011-06-30 15:51:33',
 		'description': 'Employees Daily Attendance Tracking Form',
 		'display_name': 'Attendance',
 		'doc_name': 'Attendance',
@@ -60,17 +60,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 2,
-		'modified': '2011-03-24 15:04:46',
+		'modified': '2011-06-30 15:51:33',
 		'modified_by': 'Administrator',
-		'name': 'MDI00184',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Payroll',
+		'name': 'MDI01336',
+		'owner': 'Administrator',
+		'parent': 'HR',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-11-30 22:42:05',
+		'creation': '2011-06-30 15:51:33',
 		'description': 'Upload Attendance data',
 		'display_name': 'Attendance Control Panel',
 		'doc_name': 'Attendance Control Panel',
@@ -81,17 +81,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 3,
-		'modified': '2011-03-24 15:04:46',
+		'modified': '2011-06-30 15:51:33',
 		'modified_by': 'Administrator',
-		'name': 'MDI00185',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Payroll',
+		'name': 'MDI01337',
+		'owner': 'Administrator',
+		'parent': 'HR',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-11-30 22:42:05',
+		'creation': '2011-06-30 15:51:33',
 		'description': 'Leave allocation for selected employees at a time',
 		'display_name': 'Leave Control Panel',
 		'doc_name': 'Leave Control Panel',
@@ -102,17 +102,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 4,
-		'modified': '2011-03-24 15:04:47',
+		'modified': '2011-06-30 15:51:33',
 		'modified_by': 'Administrator',
-		'name': 'MDI00187',
+		'name': 'MDI01338',
 		'owner': 'Administrator',
-		'parent': 'Payroll',
+		'parent': 'HR',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-02-21 10:01:28',
+		'creation': '2011-06-30 15:51:33',
 		'description': 'Allocate leave for fiscal year',
 		'display_name': 'Leave Allocation',
 		'doc_name': 'Leave Allocation',
@@ -123,17 +123,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 5,
-		'modified': '2011-03-24 15:04:47',
+		'modified': '2011-06-30 15:51:33',
 		'modified_by': 'Administrator',
-		'name': 'MDI00290',
+		'name': 'MDI01339',
 		'owner': 'Administrator',
-		'parent': 'Payroll',
+		'parent': 'HR',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-02-21 10:01:28',
+		'creation': '2011-06-30 15:51:33',
 		'description': 'Apply Leave',
 		'display_name': 'Leave Application',
 		'doc_name': 'Leave Application',
@@ -144,17 +144,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 6,
-		'modified': '2011-03-24 15:04:47',
+		'modified': '2011-06-30 15:51:33',
 		'modified_by': 'Administrator',
-		'name': 'MDI00291',
+		'name': 'MDI01340',
 		'owner': 'Administrator',
-		'parent': 'Payroll',
+		'parent': 'HR',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-11-30 22:42:05',
+		'creation': '2011-06-30 15:51:33',
 		'description': 'Submit Employees Expenses',
 		'display_name': 'Expense Voucher',
 		'doc_name': 'Expense Voucher',
@@ -165,17 +165,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 7,
-		'modified': '2011-03-24 15:04:47',
+		'modified': '2011-06-30 15:51:33',
 		'modified_by': 'Administrator',
-		'name': 'MDI00188',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Payroll',
+		'name': 'MDI01341',
+		'owner': 'Administrator',
+		'parent': 'HR',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-11-30 22:42:05',
+		'creation': '2011-06-30 15:51:33',
 		'description': 'Assign Responsibilities to employee and evaluate',
 		'display_name': 'Appraisal',
 		'doc_name': 'Appraisal',
@@ -186,17 +186,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 8,
-		'modified': '2011-03-24 15:04:47',
+		'modified': '2011-06-30 15:51:33',
 		'modified_by': 'Administrator',
-		'name': 'MDI00189',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Payroll',
+		'name': 'MDI01342',
+		'owner': 'Administrator',
+		'parent': 'HR',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-11-30 22:42:05',
+		'creation': '2011-06-30 15:51:33',
 		'description': 'Generate Salary Structure heads for an employee',
 		'display_name': 'Salary Structure',
 		'doc_name': 'Salary Structure',
@@ -207,17 +207,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 9,
-		'modified': '2011-03-24 15:04:47',
+		'modified': '2011-06-30 15:51:33',
 		'modified_by': 'Administrator',
-		'name': 'MDI00190',
+		'name': 'MDI01343',
 		'owner': 'Administrator',
-		'parent': 'Payroll',
+		'parent': 'HR',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-11-30 22:42:05',
+		'creation': '2011-06-30 15:51:33',
 		'description': 'Generate Salary Slip for an employee',
 		'display_name': 'Salary Slip',
 		'doc_name': 'Salary Slip',
@@ -228,17 +228,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 10,
-		'modified': '2011-03-24 15:04:47',
+		'modified': '2011-06-30 15:51:33',
 		'modified_by': 'Administrator',
-		'name': 'MDI00192',
+		'name': 'MDI01344',
 		'owner': 'Administrator',
-		'parent': 'Payroll',
+		'parent': 'HR',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-11-30 22:42:05',
+		'creation': '2011-06-30 15:51:33',
 		'description': 'Generate Salary Slip for all employee at a time',
 		'display_name': 'Salary Slip Control Panel',
 		'doc_name': 'Salary Slip Control Panel',
@@ -249,17 +249,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 11,
-		'modified': '2011-03-24 15:04:47',
+		'modified': '2011-06-30 15:51:33',
 		'modified_by': 'Administrator',
-		'name': 'MDI00193',
+		'name': 'MDI01345',
 		'owner': 'Administrator',
-		'parent': 'Payroll',
+		'parent': 'HR',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-11-30 22:42:05',
+		'creation': '2011-06-30 15:51:33',
 		'description': 'Job Applications received for various positions',
 		'display_name': 'Job Application',
 		'doc_name': 'Job Application',
@@ -270,17 +270,80 @@
 		'hide': None,
 		'icon': None,
 		'idx': 12,
-		'modified': '2011-03-24 15:04:47',
+		'modified': '2011-06-30 15:51:33',
 		'modified_by': 'Administrator',
-		'name': 'MDI00194',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Payroll',
+		'name': 'MDI01346',
+		'owner': 'Administrator',
+		'parent': 'HR',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-02-21 10:01:28',
+		'creation': '2011-06-30 15:51:33',
+		'description': None,
+		'display_name': 'Employee Information',
+		'doc_name': 'Employee',
+		'doc_type': 'Reports',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': None,
+		'hide': None,
+		'icon': None,
+		'idx': 13,
+		'modified': '2011-06-30 15:51:33',
+		'modified_by': 'Administrator',
+		'name': 'MDI01347',
+		'owner': 'Administrator',
+		'parent': 'HR',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:51:33',
+		'description': None,
+		'display_name': "Employee's Birthday",
+		'doc_name': 'Employee',
+		'doc_type': 'Reports',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': None,
+		'hide': None,
+		'icon': None,
+		'idx': 14,
+		'modified': '2011-06-30 15:51:33',
+		'modified_by': 'Administrator',
+		'name': 'MDI01348',
+		'owner': 'Administrator',
+		'parent': 'HR',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:51:33',
+		'description': None,
+		'display_name': 'New or left employees for a month',
+		'doc_name': 'Employee',
+		'doc_type': 'Reports',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': None,
+		'hide': None,
+		'icon': None,
+		'idx': 15,
+		'modified': '2011-06-30 15:51:33',
+		'modified_by': 'Administrator',
+		'name': 'MDI01349',
+		'owner': 'Administrator',
+		'parent': 'HR',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:51:33',
 		'description': None,
 		'display_name': 'Monthly Attendance Details',
 		'doc_name': 'Attendance',
@@ -291,17 +354,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 16,
-		'modified': '2011-03-24 15:04:47',
+		'modified': '2011-06-30 15:51:33',
 		'modified_by': 'Administrator',
-		'name': 'MDI00296',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Payroll',
+		'name': 'MDI01350',
+		'owner': 'Administrator',
+		'parent': 'HR',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-02-21 15:32:43',
+		'creation': '2011-06-30 15:51:33',
 		'description': None,
 		'display_name': 'Leave Application Details',
 		'doc_name': 'Leave Application',
@@ -312,17 +375,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 17,
-		'modified': '2011-03-24 15:04:47',
+		'modified': '2011-06-30 15:51:33',
 		'modified_by': 'Administrator',
-		'name': 'MDI00306',
+		'name': 'MDI01351',
 		'owner': 'Administrator',
-		'parent': 'Payroll',
+		'parent': 'HR',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-02-21 15:32:43',
+		'creation': '2011-06-30 15:51:34',
 		'description': None,
 		'display_name': 'Leave Allocation Details',
 		'doc_name': 'Leave Allocation',
@@ -333,206 +396,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 18,
-		'modified': '2011-03-24 15:04:47',
+		'modified': '2011-06-30 15:51:34',
 		'modified_by': 'Administrator',
-		'name': 'MDI00307',
+		'name': 'MDI01352',
 		'owner': 'Administrator',
-		'parent': 'Payroll',
+		'parent': 'HR',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-03-24 15:04:47',
-		'description': None,
-		'display_name': 'Employeewise Leave Transaction Details',
-		'doc_name': 'Leave Transaction',
-		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 20,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': '000003092',
-		'owner': 'Administrator',
-		'parent': 'Payroll',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-02-21 10:01:28',
-		'description': None,
-		'display_name': 'Employeewise Balance Leave Report',
-		'doc_name': 'Employee',
-		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 21,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': 'MDI00293',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Payroll',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-02-21 10:01:28',
-		'description': None,
-		'display_name': 'Salary Structure Details',
-		'doc_name': 'Salary Structure',
-		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 22,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': 'MDI00299',
-		'owner': 'Administrator',
-		'parent': 'Payroll',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-02-21 10:01:28',
-		'description': None,
-		'display_name': 'Salary Slips',
-		'doc_name': 'Salary Slip',
-		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 24,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': 'MDI00300',
-		'owner': 'Administrator',
-		'parent': 'Payroll',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2010-11-30 22:42:05',
-		'description': 'Income Tax Calculation',
-		'display_name': 'IT Checklist',
-		'doc_name': 'IT Checklist',
-		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': 'fiscal_year\nis_cheklist_active\nemployee\nnet_tot_tax_income\ntax_tot_income\nedu_cess\napplicable_from\nrem_months\ntax_per_month',
-		'hide': None,
-		'icon': None,
-		'idx': 26,
-		'modified': '2010-11-30 22:42:05',
-		'modified_by': 'Administrator',
-		'name': 'MDI00191',
-		'owner': 'Administrator',
-		'parent': 'Payroll',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-02-21 10:01:28',
-		'description': None,
-		'display_name': 'Employee Appraisals',
-		'doc_name': 'Appraisal',
-		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 26,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': 'MDI00302',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Payroll',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-02-21 10:01:29',
-		'description': None,
-		'display_name': 'Expense Vouchers',
-		'doc_name': 'Expense Voucher',
-		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 28,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': 'MDI00304',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Payroll',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-02-21 10:01:28',
-		'description': None,
-		'display_name': "Employee's Birthday",
-		'doc_name': 'Employee',
-		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 31,
-		'modified': '2011-02-21 10:01:28',
-		'modified_by': 'Administrator',
-		'name': 'MDI00294',
-		'owner': 'Administrator',
-		'parent': 'Payroll',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-02-21 10:01:28',
-		'description': None,
-		'display_name': 'New or left employees for a month',
-		'doc_name': 'Employee',
-		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 32,
-		'modified': '2011-02-21 10:01:28',
-		'modified_by': 'Administrator',
-		'name': 'MDI00295',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Payroll',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-02-21 15:32:43',
+		'creation': '2011-06-30 15:51:34',
 		'description': None,
 		'display_name': 'Employee Leave Balance Report',
 		'doc_name': 'Employee',
@@ -542,18 +416,60 @@
 		'fields': None,
 		'hide': None,
 		'icon': None,
-		'idx': 36,
-		'modified': '2011-02-21 15:32:43',
+		'idx': 19,
+		'modified': '2011-06-30 15:51:34',
 		'modified_by': 'Administrator',
-		'name': 'MDI00308',
+		'name': 'MDI01353',
 		'owner': 'Administrator',
-		'parent': 'Payroll',
+		'parent': 'HR',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-02-21 10:01:28',
+		'creation': '2011-06-30 15:51:34',
+		'description': None,
+		'display_name': 'Salary Structure Details',
+		'doc_name': 'Salary Structure',
+		'doc_type': 'Reports',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': None,
+		'hide': None,
+		'icon': None,
+		'idx': 20,
+		'modified': '2011-06-30 15:51:34',
+		'modified_by': 'Administrator',
+		'name': 'MDI01354',
+		'owner': 'Administrator',
+		'parent': 'HR',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:51:34',
+		'description': None,
+		'display_name': 'Salary Register',
+		'doc_name': 'Salary Slip',
+		'doc_type': 'Reports',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': None,
+		'hide': None,
+		'icon': None,
+		'idx': 21,
+		'modified': '2011-06-30 15:51:34',
+		'modified_by': 'Administrator',
+		'name': 'MDI01355',
+		'owner': 'Administrator',
+		'parent': 'HR',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:51:34',
 		'description': None,
 		'display_name': 'Salary Slips',
 		'doc_name': 'Salary Slip',
@@ -563,18 +479,39 @@
 		'fields': None,
 		'hide': None,
 		'icon': None,
-		'idx': 41,
-		'modified': '2011-02-21 10:01:28',
+		'idx': 22,
+		'modified': '2011-06-30 15:51:34',
 		'modified_by': 'Administrator',
-		'name': 'MDI00301',
+		'name': 'MDI01356',
 		'owner': 'Administrator',
-		'parent': 'Payroll',
+		'parent': 'HR',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-02-21 10:01:29',
+		'creation': '2011-06-30 15:51:34',
+		'description': None,
+		'display_name': 'Pending Appraisals',
+		'doc_name': 'Appraisal',
+		'doc_type': 'Reports',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': None,
+		'hide': None,
+		'icon': None,
+		'idx': 23,
+		'modified': '2011-06-30 15:51:34',
+		'modified_by': 'Administrator',
+		'name': 'MDI01357',
+		'owner': 'Administrator',
+		'parent': 'HR',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:51:34',
 		'description': None,
 		'display_name': 'Employee Appraisals',
 		'doc_name': 'Appraisal',
@@ -584,18 +521,39 @@
 		'fields': None,
 		'hide': None,
 		'icon': None,
-		'idx': 43,
-		'modified': '2011-02-21 10:01:29',
+		'idx': 24,
+		'modified': '2011-06-30 15:51:34',
 		'modified_by': 'Administrator',
-		'name': 'MDI00303',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Payroll',
+		'name': 'MDI01358',
+		'owner': 'Administrator',
+		'parent': 'HR',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-02-21 10:01:29',
+		'creation': '2011-06-30 15:51:34',
+		'description': None,
+		'display_name': 'Pending Expense Vouchers',
+		'doc_name': 'Expense Voucher',
+		'doc_type': 'Reports',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': None,
+		'hide': None,
+		'icon': None,
+		'idx': 25,
+		'modified': '2011-06-30 15:51:34',
+		'modified_by': 'Administrator',
+		'name': 'MDI01359',
+		'owner': 'Administrator',
+		'parent': 'HR',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:51:34',
 		'description': None,
 		'display_name': 'Expense Vouchers',
 		'doc_name': 'Expense Voucher',
@@ -605,39 +563,39 @@
 		'fields': None,
 		'hide': None,
 		'icon': None,
-		'idx': 45,
-		'modified': '2011-02-21 10:01:29',
+		'idx': 26,
+		'modified': '2011-06-30 15:51:34',
 		'modified_by': 'Administrator',
-		'name': 'MDI00305',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Payroll',
+		'name': 'MDI01360',
+		'owner': 'Administrator',
+		'parent': 'HR',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
-		'creation': '2010-11-30 22:42:05',
+		'creation': '2011-06-30 15:51:34',
 		'docstatus': 0,
 		'doctype': 'Module Def Role',
 		'idx': 1,
-		'modified': '2010-11-30 22:42:05',
+		'modified': '2011-06-30 15:51:34',
 		'modified_by': 'Administrator',
-		'name': 'MDR00038',
+		'name': 'MDR00340',
 		'owner': 'Administrator',
-		'parent': 'Payroll',
+		'parent': 'HR',
 		'parentfield': 'roles',
 		'parenttype': 'Module Def',
 		'role': 'HR Manager'
 	},
 	{
-		'creation': '2010-11-30 22:42:05',
+		'creation': '2011-06-30 15:51:34',
 		'docstatus': 0,
 		'doctype': 'Module Def Role',
 		'idx': 2,
-		'modified': '2010-11-30 22:42:05',
+		'modified': '2011-06-30 15:51:34',
 		'modified_by': 'Administrator',
-		'name': 'MDR00039',
+		'name': 'MDR00341',
 		'owner': 'Administrator',
-		'parent': 'Payroll',
+		'parent': 'HR',
 		'parentfield': 'roles',
 		'parenttype': 'Module Def',
 		'role': 'HR User'
diff --git a/roles/Role/Employee/Employee.txt b/hr/Role/Employee/Employee.txt
similarity index 100%
rename from roles/Role/Employee/Employee.txt
rename to hr/Role/Employee/Employee.txt
diff --git a/roles/Role/HR Manager/HR Manager.txt b/hr/Role/HR Manager/HR Manager.txt
similarity index 100%
rename from roles/Role/HR Manager/HR Manager.txt
rename to hr/Role/HR Manager/HR Manager.txt
diff --git a/roles/Role/HR User/HR User.txt b/hr/Role/HR User/HR User.txt
similarity index 100%
rename from roles/Role/HR User/HR User.txt
rename to hr/Role/HR User/HR User.txt
diff --git a/application_internal/doctype/module_setter/__init__.py b/hr/__init__.py
similarity index 100%
rename from application_internal/doctype/module_setter/__init__.py
rename to hr/__init__.py
diff --git a/application_internal/doctype/module_tip_control/__init__.py b/hr/doctype/__init__.py
similarity index 100%
rename from application_internal/doctype/module_tip_control/__init__.py
rename to hr/doctype/__init__.py
diff --git a/application_internal/doctype/multiple_transfer/__init__.py b/hr/doctype/absent_days_detail/__init__.py
similarity index 100%
rename from application_internal/doctype/multiple_transfer/__init__.py
rename to hr/doctype/absent_days_detail/__init__.py
diff --git a/hr/doctype/absent_days_detail/absent_days_detail.txt b/hr/doctype/absent_days_detail/absent_days_detail.txt
new file mode 100644
index 0000000000..2e6f58aaab
--- /dev/null
+++ b/hr/doctype/absent_days_detail/absent_days_detail.txt
@@ -0,0 +1,137 @@
+# DocType, Absent Days Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'version': 5
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Absent Days Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'Absent Days Detail',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'write': 1
+	},
+
+	# DocType, Absent Days Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Absent Days Detail'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'leave_type',
+		'fieldtype': 'Select',
+		'idx': 1,
+		'label': 'Leave Type',
+		'oldfieldname': 'leave_type',
+		'oldfieldtype': 'Select',
+		'options': 'link:Leave Type'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'no_of_leave_days',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'No of leave days',
+		'oldfieldname': 'no_of_leave_days',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'from_date',
+		'fieldtype': 'Date',
+		'idx': 3,
+		'label': 'From Date',
+		'oldfieldname': 'from_date',
+		'oldfieldtype': 'Date'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'to_date',
+		'fieldtype': 'Date',
+		'idx': 4,
+		'label': 'To Date',
+		'oldfieldname': 'to_date',
+		'oldfieldtype': 'Date'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'previous_balance',
+		'fieldtype': 'Data',
+		'idx': 5,
+		'label': 'Previous Balance',
+		'oldfieldname': 'previous_balance',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'current_balance',
+		'fieldtype': 'Data',
+		'idx': 6,
+		'label': 'Current Balance',
+		'oldfieldname': 'current_balance',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'max_allowed',
+		'fieldtype': 'Data',
+		'idx': 7,
+		'label': 'Max. Allowed',
+		'oldfieldname': 'max_allowed',
+		'oldfieldtype': 'Data'
+	}
+]
\ No newline at end of file
diff --git a/application_internal/doctype/password_control/__init__.py b/hr/doctype/appraisal/__init__.py
similarity index 100%
rename from application_internal/doctype/password_control/__init__.py
rename to hr/doctype/appraisal/__init__.py
diff --git a/payroll/doctype/appraisal/appraisal.js b/hr/doctype/appraisal/appraisal.js
similarity index 100%
rename from payroll/doctype/appraisal/appraisal.js
rename to hr/doctype/appraisal/appraisal.js
diff --git a/payroll/doctype/appraisal/appraisal.py b/hr/doctype/appraisal/appraisal.py
similarity index 100%
rename from payroll/doctype/appraisal/appraisal.py
rename to hr/doctype/appraisal/appraisal.py
diff --git a/hr/doctype/appraisal/appraisal.txt b/hr/doctype/appraisal/appraisal.txt
new file mode 100644
index 0000000000..3521c6f867
--- /dev/null
+++ b/hr/doctype/appraisal/appraisal.txt
@@ -0,0 +1,415 @@
+# DocType, Appraisal
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-09-01 15:48:05',
+		'docstatus': 0,
+		'modified': '2011-06-27 14:39:10',
+		'modified_by': 'Administrator',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308808105',
+		'autoname': 'APRSL.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'HR',
+		'name': '__common__',
+		'search_fields': 'status, employee, employee_name',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 160
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Appraisal',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Appraisal',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Appraisal
+	{
+		'doctype': 'DocType',
+		'name': 'Appraisal'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'HR Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 0,
+		'role': 'HR User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 7,
+		'permlevel': 1,
+		'role': 'HR Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 8,
+		'permlevel': 1,
+		'role': 'HR User'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Employee Details',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Draft',
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Select',
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'Status',
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Select',
+		'options': '\nDraft\nSubmitted\nCompleted\nCancelled',
+		'permlevel': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'employee',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Employee',
+		'oldfieldname': 'employee',
+		'oldfieldtype': 'Link',
+		'options': 'Employee',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'employee_name',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Employee Name',
+		'oldfieldname': 'employee_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Select',
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'link:Company',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 7,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'start_date',
+		'fieldtype': 'Date',
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'Start Date',
+		'oldfieldname': 'start_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'end_date',
+		'fieldtype': 'Date',
+		'idx': 9,
+		'in_filter': 1,
+		'label': 'End Date',
+		'oldfieldname': 'end_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'kra_approver',
+		'fieldtype': 'Select',
+		'idx': 10,
+		'in_filter': 0,
+		'label': 'Approver',
+		'oldfieldname': 'kra_approver',
+		'oldfieldtype': 'Select',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 11,
+		'label': 'Amended From',
+		'no_copy': 1,
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'hidden': 1,
+		'idx': 12,
+		'label': 'Amendment Date',
+		'no_copy': 1,
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 1,
+		'width': '160px'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 13,
+		'label': 'Declare Completed',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 14,
+		'oldfieldtype': 'Section Break',
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Select template from which you want to fetch KRA',
+		'doctype': 'DocField',
+		'fieldname': 'kra_template',
+		'fieldtype': 'Link',
+		'idx': 15,
+		'label': 'KRA Template',
+		'oldfieldname': 'kra_template',
+		'oldfieldtype': 'Link',
+		'options': 'KRA Template',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 16,
+		'label': 'Fetch Template',
+		'oldfieldtype': 'Button',
+		'options': 'fetch_kra',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'hidden': 1,
+		'idx': 17,
+		'label': 'Update',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'appraisal_details',
+		'fieldtype': 'Table',
+		'idx': 18,
+		'label': 'Appraisal Details',
+		'oldfieldname': 'appraisal_details',
+		'oldfieldtype': 'Table',
+		'options': 'Appraisal Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 19,
+		'label': 'Calculate Total Score',
+		'oldfieldtype': 'Button',
+		'options': 'calculate_total',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'total_score',
+		'fieldtype': 'Currency',
+		'idx': 20,
+		'label': 'Total Score',
+		'no_copy': 1,
+		'oldfieldname': 'total_score',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/application_internal/doctype/patch_util/__init__.py b/hr/doctype/appraisal_detail/__init__.py
similarity index 100%
rename from application_internal/doctype/patch_util/__init__.py
rename to hr/doctype/appraisal_detail/__init__.py
diff --git a/hr/doctype/appraisal_detail/appraisal_detail.txt b/hr/doctype/appraisal_detail/appraisal_detail.txt
new file mode 100644
index 0000000000..fa57bef30e
--- /dev/null
+++ b/hr/doctype/appraisal_detail/appraisal_detail.txt
@@ -0,0 +1,112 @@
+# DocType, Appraisal Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-09-01 15:48:05',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'rahul@webnotestech.com',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'APRSLD.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 13
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Appraisal Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Appraisal Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Appraisal Detail'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Key Responsibility Area',
+		'doctype': 'DocField',
+		'fieldname': 'kra',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'KRA',
+		'oldfieldname': 'kra',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'per_weightage',
+		'fieldtype': 'Currency',
+		'idx': 2,
+		'label': 'Weightage (%)',
+		'oldfieldname': 'per_weightage',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'target_achieved',
+		'fieldtype': 'Small Text',
+		'idx': 3,
+		'label': 'Target Achieved',
+		'no_copy': 1,
+		'oldfieldname': 'target_achieved',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'score',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'label': 'Score (0-5)',
+		'no_copy': 1,
+		'oldfieldname': 'score',
+		'oldfieldtype': 'Select',
+		'options': '\n0\n1\n2\n3\n4\n5',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'score_earned',
+		'fieldtype': 'Currency',
+		'idx': 5,
+		'label': 'Score Earned',
+		'no_copy': 1,
+		'oldfieldname': 'score_earned',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/application_internal/doctype/payroll_tips_common/__init__.py b/hr/doctype/attendance/__init__.py
similarity index 100%
rename from application_internal/doctype/payroll_tips_common/__init__.py
rename to hr/doctype/attendance/__init__.py
diff --git a/payroll/doctype/attendance/attendance.js b/hr/doctype/attendance/attendance.js
similarity index 100%
rename from payroll/doctype/attendance/attendance.js
rename to hr/doctype/attendance/attendance.js
diff --git a/payroll/doctype/attendance/attendance.py b/hr/doctype/attendance/attendance.py
similarity index 100%
rename from payroll/doctype/attendance/attendance.py
rename to hr/doctype/attendance/attendance.py
diff --git a/hr/doctype/attendance/attendance.txt b/hr/doctype/attendance/attendance.txt
new file mode 100644
index 0000000000..a52225e7a5
--- /dev/null
+++ b/hr/doctype/attendance/attendance.txt
@@ -0,0 +1,226 @@
+# DocType, Attendance
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-09-23 10:26:03',
+		'docstatus': 0,
+		'modified': '2011-06-27 14:39:08',
+		'modified_by': 'Administrator',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308808105',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'HR',
+		'name': '__common__',
+		'search_fields': 'employee, employee_name, att_date, status',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 74
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Attendance',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Attendance',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocType, Attendance
+	{
+		'doctype': 'DocType',
+		'name': 'Attendance'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'role': 'HR User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'role': 'HR Manager'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'System Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Attendance Details',
+		'oldfieldtype': 'Section Break',
+		'options': 'Simple'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'naming_series',
+		'fieldtype': 'Select',
+		'idx': 2,
+		'label': 'Naming Series',
+		'no_copy': 1,
+		'oldfieldname': 'naming_series',
+		'oldfieldtype': 'Select',
+		'options': 'ATT',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'employee',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Employee',
+		'oldfieldname': 'employee',
+		'oldfieldtype': 'Link',
+		'options': 'Employee',
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'employee_name',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'Employee Name',
+		'oldfieldname': 'employee_name',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Select',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Status',
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Select',
+		'options': '\nPresent\nAbsent\nHalf Day',
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'shifts',
+		'fieldtype': 'Select',
+		'idx': 6,
+		'label': 'Shifts',
+		'oldfieldname': 'shifts',
+		'oldfieldtype': 'Select',
+		'options': '\nDay\nNight',
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'leave_type',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 7,
+		'label': 'Leave Type',
+		'oldfieldname': 'leave_type',
+		'oldfieldtype': 'Link',
+		'options': 'Leave Type',
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 8,
+		'oldfieldtype': 'Column Break',
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'att_date',
+		'fieldtype': 'Date',
+		'idx': 9,
+		'in_filter': 1,
+		'label': 'Attendance Date',
+		'oldfieldname': 'att_date',
+		'oldfieldtype': 'Date',
+		'reqd': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 10,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Select',
+		'idx': 11,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'link:Company',
+		'reqd': 1
+	}
+]
\ No newline at end of file
diff --git a/application_internal/doctype/production_tips_common/__init__.py b/hr/doctype/attendance_control_panel/__init__.py
similarity index 100%
rename from application_internal/doctype/production_tips_common/__init__.py
rename to hr/doctype/attendance_control_panel/__init__.py
diff --git a/payroll/doctype/attendance_control_panel/attendance_control_panel.js b/hr/doctype/attendance_control_panel/attendance_control_panel.js
similarity index 100%
rename from payroll/doctype/attendance_control_panel/attendance_control_panel.js
rename to hr/doctype/attendance_control_panel/attendance_control_panel.js
diff --git a/payroll/doctype/attendance_control_panel/attendance_control_panel.py b/hr/doctype/attendance_control_panel/attendance_control_panel.py
similarity index 100%
rename from payroll/doctype/attendance_control_panel/attendance_control_panel.py
rename to hr/doctype/attendance_control_panel/attendance_control_panel.py
diff --git a/hr/doctype/attendance_control_panel/attendance_control_panel.txt b/hr/doctype/attendance_control_panel/attendance_control_panel.txt
new file mode 100644
index 0000000000..af30e04e9f
--- /dev/null
+++ b/hr/doctype/attendance_control_panel/attendance_control_panel.txt
@@ -0,0 +1,229 @@
+# DocType, Attendance Control Panel
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-10-19 11:19:24',
+		'docstatus': 0,
+		'modified': '2011-01-04 13:33:33',
+		'modified_by': 'rahul@webnotestech.com',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1294312182',
+		'allow_attach': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'max_attachments': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 122
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Attendance Control Panel',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Attendance Control Panel',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Attendance Control Panel
+	{
+		'doctype': 'DocType',
+		'name': 'Attendance Control Panel'
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'HR User',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'HR Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'HR User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 1,
+		'role': 'HR Manager'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': "Get the template of the Attendance for which you want to import in CSV (Comma seperated values) format.\nFill data in the template. Save the template in CSV format.\nAll attendance dates inbetween 'Attendance From Date' and 'Attendance To Date' will come in the template with employees list.",
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Download Template',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Selected Attendance date will comes in the attendance template.',
+		'doctype': 'DocField',
+		'fieldname': 'att_fr_date',
+		'fieldtype': 'Date',
+		'idx': 2,
+		'label': 'Attendance From Date',
+		'oldfieldname': 'attenadnce_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 3,
+		'label': 'Get Template',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 4,
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'All attendance dates inbetween selected Attendance From Date and Attendance To Date will come in the template with employees list.',
+		'doctype': 'DocField',
+		'fieldname': 'att_to_date',
+		'fieldtype': 'Date',
+		'idx': 5,
+		'label': 'Attendance To Date',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'To import attendance data, click on "Add" button, select the saved CSV file and click on "Upload".\nSelect the date format as attendance date format in CSV file.\nClick on "Import".',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 6,
+		'label': 'Upload Attendance Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'import_date_format',
+		'fieldtype': 'Select',
+		'idx': 7,
+		'label': 'Import Date Format ',
+		'options': 'yyyy-mm-dd\nmm/dd/yyyy\nmm/dd/yy\ndd-mm-yyyy\ndd/mm/yyyy',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'overwrite',
+		'fieldtype': 'Check',
+		'idx': 8,
+		'label': 'Overwrite',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 9,
+		'label': 'Import',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'file_list',
+		'fieldtype': 'Text',
+		'hidden': 1,
+		'idx': 10,
+		'label': 'File List',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 11,
+		'label': 'Import Log',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 12,
+		'label': 'Import Log1',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/application_internal/doctype/profile_control/__init__.py b/hr/doctype/branch/__init__.py
similarity index 100%
rename from application_internal/doctype/profile_control/__init__.py
rename to hr/doctype/branch/__init__.py
diff --git a/application_internal/doctype/report_field_detail/__init__.py b/hr/doctype/branch/branch.js
similarity index 100%
rename from application_internal/doctype/report_field_detail/__init__.py
rename to hr/doctype/branch/branch.js
diff --git a/hr/doctype/branch/branch.txt b/hr/doctype/branch/branch.txt
new file mode 100644
index 0000000000..f402474362
--- /dev/null
+++ b/hr/doctype/branch/branch.txt
@@ -0,0 +1,104 @@
+# DocType, Branch
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:53',
+		'docstatus': 0,
+		'modified': '2011-05-30 15:24:02',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:branch',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 11
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Branch',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'amend': 0,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Branch',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocType, Branch
+	{
+		'doctype': 'DocType',
+		'name': 'Branch'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'HR User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'role': 'HR Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'branch',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Branch',
+		'oldfieldname': 'branch',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	}
+]
\ No newline at end of file
diff --git a/application_internal/doctype/report_filter_detail/__init__.py b/hr/doctype/chapter_vi_a_detail/__init__.py
similarity index 100%
rename from application_internal/doctype/report_filter_detail/__init__.py
rename to hr/doctype/chapter_vi_a_detail/__init__.py
diff --git a/hr/doctype/chapter_vi_a_detail/chapter_vi_a_detail.txt b/hr/doctype/chapter_vi_a_detail/chapter_vi_a_detail.txt
new file mode 100644
index 0000000000..60ce4b3c61
--- /dev/null
+++ b/hr/doctype/chapter_vi_a_detail/chapter_vi_a_detail.txt
@@ -0,0 +1,145 @@
+# DocType, Chapter VI A Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:54',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 9
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Chapter VI A Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Chapter VI A Detail',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'role': 'System Manager'
+	},
+
+	# DocType, Chapter VI A Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Chapter VI A Detail'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'particulars3',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Particulars',
+		'oldfieldname': 'particulars3',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1,
+		'reqd': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'under_section3',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Under Section',
+		'oldfieldname': 'under_section3',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'max_limit3',
+		'fieldtype': 'Currency',
+		'idx': 3,
+		'label': 'Max. Limit',
+		'oldfieldname': 'max_limit3',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'actual_amount3',
+		'fieldtype': 'Currency',
+		'idx': 4,
+		'label': 'Actual Amount',
+		'oldfieldname': 'actual_amount3',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'eligible_amount3',
+		'fieldtype': 'Currency',
+		'idx': 5,
+		'label': 'Eligible Amount',
+		'oldfieldname': 'eligible_amount3',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'modified_amount3',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'label': 'Modified Amount',
+		'oldfieldname': 'modified_amount3',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/application_internal/doctype/sms_center/__init__.py b/hr/doctype/declaration_detail/__init__.py
similarity index 100%
rename from application_internal/doctype/sms_center/__init__.py
rename to hr/doctype/declaration_detail/__init__.py
diff --git a/hr/doctype/declaration_detail/declaration_detail.txt b/hr/doctype/declaration_detail/declaration_detail.txt
new file mode 100644
index 0000000000..3c06cfde8e
--- /dev/null
+++ b/hr/doctype/declaration_detail/declaration_detail.txt
@@ -0,0 +1,144 @@
+# DocType, Declaration Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:57',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 7
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Declaration Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Declaration Detail',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'role': 'System Manager'
+	},
+
+	# DocType, Declaration Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Declaration Detail'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'particulars1',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Particulars',
+		'oldfieldname': 'particulars1',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1,
+		'reqd': 1,
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'under_section1',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Under Section',
+		'oldfieldname': 'under_section1',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'max_limit1',
+		'fieldtype': 'Currency',
+		'idx': 3,
+		'label': 'Max. Limit',
+		'oldfieldname': 'max_limit1',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'actual_amount1',
+		'fieldtype': 'Currency',
+		'idx': 4,
+		'label': 'Actual Amount',
+		'oldfieldname': 'actual_amount1',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'eligible_amount1',
+		'fieldtype': 'Currency',
+		'idx': 5,
+		'label': 'Eligible Amount',
+		'oldfieldname': 'eligible_amount1',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'modified_amount1',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'label': 'Modified Amount',
+		'oldfieldname': 'modified_amount1',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/application_internal/doctype/sso_control/__init__.py b/hr/doctype/deduction_detail/__init__.py
similarity index 100%
rename from application_internal/doctype/sso_control/__init__.py
rename to hr/doctype/deduction_detail/__init__.py
diff --git a/hr/doctype/deduction_detail/deduction_detail.txt b/hr/doctype/deduction_detail/deduction_detail.txt
new file mode 100644
index 0000000000..ee24d79835
--- /dev/null
+++ b/hr/doctype/deduction_detail/deduction_detail.txt
@@ -0,0 +1,77 @@
+# DocType, Deduction Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:57',
+		'docstatus': 0,
+		'modified': '2010-11-02 20:44:58',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 14
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Deduction Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Deduction Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Deduction Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'd_type',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Type',
+		'oldfieldname': 'd_type',
+		'oldfieldtype': 'Select',
+		'options': 'Deduction Type',
+		'reqd': 1,
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'd_modified_amt',
+		'fieldtype': 'Currency',
+		'idx': 3,
+		'label': 'Amount',
+		'oldfieldname': 'd_modified_amt',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'depend_on_lwp',
+		'fieldtype': 'Check',
+		'idx': 4,
+		'label': 'Depend on LWP',
+		'oldfieldname': 'depend_on_lwp',
+		'oldfieldtype': 'Check'
+	}
+]
\ No newline at end of file
diff --git a/application_internal/doctype/tips_common/__init__.py b/hr/doctype/deduction_type/__init__.py
similarity index 100%
rename from application_internal/doctype/tips_common/__init__.py
rename to hr/doctype/deduction_type/__init__.py
diff --git a/application_internal/doctype/transfer_account/__init__.py b/hr/doctype/deduction_type/deduction_type.js
similarity index 100%
rename from application_internal/doctype/transfer_account/__init__.py
rename to hr/doctype/deduction_type/deduction_type.js
diff --git a/hr/doctype/deduction_type/deduction_type.txt b/hr/doctype/deduction_type/deduction_type.txt
new file mode 100644
index 0000000000..c54836f751
--- /dev/null
+++ b/hr/doctype/deduction_type/deduction_type.txt
@@ -0,0 +1,115 @@
+# DocType, Deduction Type
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:57',
+		'docstatus': 0,
+		'modified': '2010-10-12 17:19:47',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:deduction_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 10
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Deduction Type',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Deduction Type',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'write': 1
+	},
+
+	# DocType, Deduction Type
+	{
+		'doctype': 'DocType',
+		'name': 'Deduction Type'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'HR User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'role': 'HR Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'deduction_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Name',
+		'oldfieldname': 'deduction_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Small Text',
+		'idx': 3,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'width': '300px'
+	}
+]
\ No newline at end of file
diff --git a/application_internal/doctype/transfer_control/__init__.py b/hr/doctype/department/__init__.py
similarity index 100%
rename from application_internal/doctype/transfer_control/__init__.py
rename to hr/doctype/department/__init__.py
diff --git a/application_internal/doctype/transfer_module/__init__.py b/hr/doctype/department/department.js
similarity index 100%
rename from application_internal/doctype/transfer_module/__init__.py
rename to hr/doctype/department/department.js
diff --git a/hr/doctype/department/department.txt b/hr/doctype/department/department.txt
new file mode 100644
index 0000000000..aae01271a3
--- /dev/null
+++ b/hr/doctype/department/department.txt
@@ -0,0 +1,102 @@
+# DocType, Department
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:58',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:department_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 7
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Department',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Department',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'write': 1
+	},
+
+	# DocType, Department
+	{
+		'doctype': 'DocType',
+		'name': 'Department'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'HR User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'role': 'HR Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'department_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Department',
+		'oldfieldname': 'department_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	}
+]
\ No newline at end of file
diff --git a/application_internal/doctype/wn_account_control/__init__.py b/hr/doctype/designation/__init__.py
similarity index 100%
rename from application_internal/doctype/wn_account_control/__init__.py
rename to hr/doctype/designation/__init__.py
diff --git a/application_internal/doctype/wn_erp_client_control/__init__.py b/hr/doctype/designation/designation.js
similarity index 100%
rename from application_internal/doctype/wn_erp_client_control/__init__.py
rename to hr/doctype/designation/designation.js
diff --git a/hr/doctype/designation/designation.txt b/hr/doctype/designation/designation.txt
new file mode 100644
index 0000000000..8a8f4d351b
--- /dev/null
+++ b/hr/doctype/designation/designation.txt
@@ -0,0 +1,102 @@
+# DocType, Designation
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:58',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:designation_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 7
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Designation',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Designation',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'write': 1
+	},
+
+	# DocType, Designation
+	{
+		'doctype': 'DocType',
+		'name': 'Designation'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'HR User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'role': 'HR Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'designation_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Designation',
+		'oldfieldname': 'designation_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	}
+]
\ No newline at end of file
diff --git a/crm/__init__.py b/hr/doctype/earn_deduction_detail/__init__.py
similarity index 100%
rename from crm/__init__.py
rename to hr/doctype/earn_deduction_detail/__init__.py
diff --git a/hr/doctype/earn_deduction_detail/earn_deduction_detail.txt b/hr/doctype/earn_deduction_detail/earn_deduction_detail.txt
new file mode 100644
index 0000000000..8b05961d49
--- /dev/null
+++ b/hr/doctype/earn_deduction_detail/earn_deduction_detail.txt
@@ -0,0 +1,116 @@
+# DocType, Earn Deduction Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:59',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'version': 4
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Earn Deduction Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'Earn Deduction Detail',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'All',
+		'write': 1
+	},
+
+	# DocType, Earn Deduction Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Earn Deduction Detail'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'earn_deduction_name',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Earn/Deduction Name',
+		'oldfieldname': 'earn_deduction_name',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'mode',
+		'fieldtype': 'Select',
+		'idx': 2,
+		'label': 'Mode',
+		'oldfieldname': 'mode',
+		'oldfieldtype': 'Select',
+		'options': '\n%\nRs'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'per',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Per.(%)',
+		'oldfieldname': 'per',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amount',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'Amount',
+		'oldfieldname': 'amount',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'type',
+		'fieldtype': 'Data',
+		'idx': 5,
+		'label': 'Type',
+		'oldfieldname': 'type',
+		'oldfieldtype': 'Data'
+	}
+]
\ No newline at end of file
diff --git a/crm/doctype/__init__.py b/hr/doctype/earning_detail/__init__.py
similarity index 100%
rename from crm/doctype/__init__.py
rename to hr/doctype/earning_detail/__init__.py
diff --git a/hr/doctype/earning_detail/earning_detail.txt b/hr/doctype/earning_detail/earning_detail.txt
new file mode 100644
index 0000000000..399c6cb844
--- /dev/null
+++ b/hr/doctype/earning_detail/earning_detail.txt
@@ -0,0 +1,80 @@
+# DocType, Earning Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:59',
+		'docstatus': 0,
+		'modified': '2011-02-09 13:02:55',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'hide_heading': 0,
+		'hide_toolbar': 0,
+		'istable': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 26
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Earning Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Earning Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Earning Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'e_type',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Type',
+		'oldfieldname': 'e_type',
+		'oldfieldtype': 'Data',
+		'options': 'Earning Type',
+		'reqd': 1,
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'modified_value',
+		'fieldtype': 'Currency',
+		'idx': 2,
+		'label': 'Amount',
+		'oldfieldname': 'modified_value',
+		'oldfieldtype': 'Currency',
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'depend_on_lwp',
+		'fieldtype': 'Check',
+		'idx': 3,
+		'label': 'Depend on LWP',
+		'oldfieldname': 'depend_on_lwp',
+		'oldfieldtype': 'Check'
+	}
+]
\ No newline at end of file
diff --git a/crm/doctype/campaign/__init__.py b/hr/doctype/earning_type/__init__.py
similarity index 100%
rename from crm/doctype/campaign/__init__.py
rename to hr/doctype/earning_type/__init__.py
diff --git a/crm/doctype/customer/__init__.py b/hr/doctype/earning_type/earning_type.js
similarity index 100%
rename from crm/doctype/customer/__init__.py
rename to hr/doctype/earning_type/earning_type.js
diff --git a/hr/doctype/earning_type/earning_type.txt b/hr/doctype/earning_type/earning_type.txt
new file mode 100644
index 0000000000..203f8b59f0
--- /dev/null
+++ b/hr/doctype/earning_type/earning_type.txt
@@ -0,0 +1,147 @@
+# DocType, Earning Type
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:59',
+		'docstatus': 0,
+		'modified': '2010-10-12 17:15:46',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:earning_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 13
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Earning Type',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Earning Type',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'write': 1
+	},
+
+	# DocType, Earning Type
+	{
+		'doctype': 'DocType',
+		'name': 'Earning Type'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'HR User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'role': 'HR Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'earning_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Name',
+		'oldfieldname': 'earning_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Small Text',
+		'idx': 3,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'reqd': 0,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'taxable',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'label': 'Taxable',
+		'oldfieldname': 'taxable',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': "eval:doc.taxable=='No'",
+		'doctype': 'DocField',
+		'fieldname': 'exemption_limit',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 5,
+		'label': 'Exemption Limit',
+		'oldfieldname': 'exemption_limit',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/crm/doctype/enquiry/__init__.py b/hr/doctype/educational_qualifications/__init__.py
similarity index 100%
rename from crm/doctype/enquiry/__init__.py
rename to hr/doctype/educational_qualifications/__init__.py
diff --git a/hr/doctype/educational_qualifications/educational_qualifications.txt b/hr/doctype/educational_qualifications/educational_qualifications.txt
new file mode 100644
index 0000000000..21f4a9adf1
--- /dev/null
+++ b/hr/doctype/educational_qualifications/educational_qualifications.txt
@@ -0,0 +1,117 @@
+# DocType, Educational Qualifications
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:59',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 11
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Educational Qualifications',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Educational Qualifications
+	{
+		'doctype': 'DocType',
+		'name': 'Educational Qualifications'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'school_univ',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'School/University',
+		'oldfieldname': 'school_univ',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'qualification',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Qualification (Degree/Diploma)',
+		'oldfieldname': 'qualification',
+		'oldfieldtype': 'Data',
+		'reqd': 0,
+		'search_index': 1,
+		'width': '170px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'level',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Level',
+		'oldfieldname': 'level',
+		'oldfieldtype': 'Select',
+		'options': '\nGraduate\nPost Graduate\nUnder Graduate',
+		'reqd': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'year_of_passing',
+		'fieldtype': 'Int',
+		'idx': 4,
+		'label': 'Year of Passing',
+		'oldfieldname': 'year_of_passing',
+		'oldfieldtype': 'Int',
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'class_percent',
+		'fieldtype': 'Data',
+		'idx': 5,
+		'label': 'Class / Percentage',
+		'oldfieldname': 'class_percent',
+		'oldfieldtype': 'Data',
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'maj_opt_sub',
+		'fieldtype': 'Data',
+		'idx': 6,
+		'label': 'Major / Optional Subject',
+		'oldfieldname': 'maj_opt_sub',
+		'oldfieldtype': 'Data',
+		'reqd': 0,
+		'width': '170px'
+	}
+]
\ No newline at end of file
diff --git a/crm/doctype/enquiry_attachment_detail/__init__.py b/hr/doctype/educational_qualifications_detail/__init__.py
similarity index 100%
rename from crm/doctype/enquiry_attachment_detail/__init__.py
rename to hr/doctype/educational_qualifications_detail/__init__.py
diff --git a/hr/doctype/educational_qualifications_detail/educational_qualifications_detail.txt b/hr/doctype/educational_qualifications_detail/educational_qualifications_detail.txt
new file mode 100644
index 0000000000..38067e01d6
--- /dev/null
+++ b/hr/doctype/educational_qualifications_detail/educational_qualifications_detail.txt
@@ -0,0 +1,109 @@
+# DocType, Educational Qualifications Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:59',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 5
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Educational Qualifications Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Educational Qualifications Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Educational Qualifications Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'school_univ',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'School/University',
+		'oldfieldname': 'school_univ',
+		'oldfieldtype': 'Small Text'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'qualification',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Qualification',
+		'oldfieldname': 'qualification',
+		'oldfieldtype': 'Data',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'level',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Level',
+		'oldfieldname': 'level',
+		'oldfieldtype': 'Select',
+		'options': 'Graduate\nPost Graduate\nUnder Graduate'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'year_of_passing',
+		'fieldtype': 'Int',
+		'idx': 4,
+		'label': 'Year of Passing',
+		'oldfieldname': 'year_of_passing',
+		'oldfieldtype': 'Int'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'class_per',
+		'fieldtype': 'Data',
+		'idx': 5,
+		'label': 'Class / Percentage',
+		'oldfieldname': 'class_per',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'maj_opt_subj',
+		'fieldtype': 'Text',
+		'idx': 6,
+		'label': 'Major/Optional Subjects',
+		'oldfieldname': 'maj_opt_subj',
+		'oldfieldtype': 'Text'
+	}
+]
\ No newline at end of file
diff --git a/crm/doctype/enquiry_detail/__init__.py b/hr/doctype/employee/__init__.py
similarity index 100%
rename from crm/doctype/enquiry_detail/__init__.py
rename to hr/doctype/employee/__init__.py
diff --git a/payroll/doctype/employee/employee.js b/hr/doctype/employee/employee.js
similarity index 100%
rename from payroll/doctype/employee/employee.js
rename to hr/doctype/employee/employee.js
diff --git a/payroll/doctype/employee/employee.py b/hr/doctype/employee/employee.py
similarity index 100%
rename from payroll/doctype/employee/employee.py
rename to hr/doctype/employee/employee.py
diff --git a/hr/doctype/employee/employee.txt b/hr/doctype/employee/employee.txt
new file mode 100644
index 0000000000..cbe281d837
--- /dev/null
+++ b/hr/doctype/employee/employee.txt
@@ -0,0 +1,1105 @@
+# DocType, Employee
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2011-02-17 11:16:08',
+		'docstatus': 0,
+		'modified': '2011-06-27 14:39:04',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308918132',
+		'allow_attach': 1,
+		'allow_trash': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'HR',
+		'name': '__common__',
+		'search_fields': 'employee_name',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': '%(employee_name)s',
+		'tag_fields': 'status',
+		'version': 443
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Employee',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Employee',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Employee
+	{
+		'doctype': 'DocType',
+		'name': 'Employee'
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'All'
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'HR User',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'HR Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 1,
+		'role': 'HR User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'HR Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Basic Information',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 2,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'description': 'To manage multiple series please go to Setup > Manage Series',
+		'doctype': 'DocField',
+		'fieldname': 'naming_series',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Naming Series',
+		'no_copy': 1,
+		'oldfieldname': 'naming_series',
+		'oldfieldtype': 'Select',
+		'options': 'WN-EMP\nEMP/',
+		'permlevel': 0,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'salutation',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'label': 'Salutation',
+		'oldfieldname': 'salutation',
+		'oldfieldtype': 'Select',
+		'options': '\nMr\nMs',
+		'permlevel': 0,
+		'search_index': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'employee_name',
+		'fieldtype': 'Data',
+		'idx': 5,
+		'label': 'Employee Name',
+		'oldfieldname': 'employee_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'employee_number',
+		'fieldtype': 'Data',
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Employee Number',
+		'oldfieldname': 'employee_number',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'date_of_joining',
+		'fieldtype': 'Date',
+		'idx': 7,
+		'label': 'Date of Joining',
+		'oldfieldname': 'date_of_joining',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'date_of_birth',
+		'fieldtype': 'Date',
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'Date of Birth',
+		'oldfieldname': 'date_of_birth',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'gender',
+		'fieldtype': 'Select',
+		'idx': 9,
+		'in_filter': 1,
+		'label': 'Gender',
+		'oldfieldname': 'gender',
+		'oldfieldtype': 'Select',
+		'options': '\nMale\nFemale',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Select',
+		'idx': 10,
+		'in_filter': 1,
+		'label': 'Company',
+		'options': 'link:Company',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 11,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Active',
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Select',
+		'idx': 12,
+		'in_filter': 1,
+		'label': 'Status',
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Select',
+		'options': '\nActive\nLeft',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'employment_type',
+		'fieldtype': 'Link',
+		'idx': 13,
+		'in_filter': 1,
+		'label': 'Employment Type',
+		'oldfieldname': 'employment_type',
+		'oldfieldtype': 'Link',
+		'options': 'Employment Type',
+		'permlevel': 0,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'scheduled_confirmation_date',
+		'fieldtype': 'Date',
+		'idx': 14,
+		'in_filter': 1,
+		'label': 'Scheduled Confirmation Date',
+		'oldfieldname': 'scheduled_confirmation_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'final_confirmation_date',
+		'fieldtype': 'Date',
+		'idx': 15,
+		'label': 'Final Confirmation Date',
+		'oldfieldname': 'final_confirmation_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contract_end_date',
+		'fieldtype': 'Date',
+		'idx': 16,
+		'in_filter': 1,
+		'label': 'Contract End Date',
+		'oldfieldname': 'contract_end_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'date_of_retirement',
+		'fieldtype': 'Date',
+		'idx': 17,
+		'label': 'Date Of Retirement',
+		'oldfieldname': 'date_of_retirement',
+		'oldfieldtype': 'Date',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Applicable Holiday List',
+		'doctype': 'DocField',
+		'fieldname': 'holiday_list',
+		'fieldtype': 'Link',
+		'idx': 18,
+		'label': 'Holiday List',
+		'oldfieldname': 'holiday_list',
+		'oldfieldtype': 'Link',
+		'options': 'Holiday List',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 19,
+		'label': 'Job Profile',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 20,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'branch',
+		'fieldtype': 'Link',
+		'idx': 21,
+		'in_filter': 1,
+		'label': 'Branch',
+		'oldfieldname': 'branch',
+		'oldfieldtype': 'Link',
+		'options': 'Branch',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'department',
+		'fieldtype': 'Link',
+		'idx': 22,
+		'in_filter': 1,
+		'label': 'Department',
+		'oldfieldname': 'department',
+		'oldfieldtype': 'Link',
+		'options': 'Department',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'designation',
+		'fieldtype': 'Link',
+		'idx': 23,
+		'in_filter': 1,
+		'label': 'Designation',
+		'oldfieldname': 'designation',
+		'oldfieldtype': 'Link',
+		'options': 'Designation',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'grade',
+		'fieldtype': 'Link',
+		'idx': 24,
+		'in_filter': 1,
+		'label': 'Grade',
+		'oldfieldname': 'grade',
+		'oldfieldtype': 'Link',
+		'options': 'Grade',
+		'permlevel': 0,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reports_to',
+		'fieldtype': 'Link',
+		'idx': 25,
+		'label': 'Reports to',
+		'oldfieldname': 'reports_to',
+		'oldfieldtype': 'Link',
+		'options': 'Employee',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'description': 'Provide email id registered in company',
+		'doctype': 'DocField',
+		'fieldname': 'company_email',
+		'fieldtype': 'Data',
+		'idx': 26,
+		'in_filter': 1,
+		'label': 'Email (By company)',
+		'oldfieldname': 'company_email',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_sales_person',
+		'fieldtype': 'Check',
+		'idx': 27,
+		'label': 'Is Sales Person',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 28,
+		'label': 'Salary Information',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'salary_mode',
+		'fieldtype': 'Select',
+		'idx': 29,
+		'label': 'Salary Mode',
+		'oldfieldname': 'salary_mode',
+		'oldfieldtype': 'Select',
+		'options': '\nBank\nCash \nCheque',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': "eval:doc.salary_mode == 'Bank'",
+		'doctype': 'DocField',
+		'fieldname': 'bank_name',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 30,
+		'in_filter': 1,
+		'label': 'Bank Name',
+		'oldfieldname': 'bank_name',
+		'oldfieldtype': 'Link',
+		'options': 'Suggest',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': "eval:doc.salary_mode == 'Bank'",
+		'doctype': 'DocField',
+		'fieldname': 'bank_ac_no',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 31,
+		'label': 'Bank A/C No.',
+		'oldfieldname': 'bank_ac_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'esic_card_no',
+		'fieldtype': 'Data',
+		'idx': 32,
+		'label': 'ESIC CARD No',
+		'oldfieldname': 'esic_card_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'pf_number',
+		'fieldtype': 'Data',
+		'idx': 33,
+		'label': 'PF Number',
+		'oldfieldname': 'pf_number',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'gratuity_lic_id',
+		'fieldtype': 'Data',
+		'idx': 34,
+		'label': 'Gratuity LIC ID',
+		'oldfieldname': 'gratuity_lic_id',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 35,
+		'label': 'Contact Details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 36,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'cell_number',
+		'fieldtype': 'Data',
+		'idx': 37,
+		'label': 'Cell Number',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'personal_email',
+		'fieldtype': 'Data',
+		'idx': 38,
+		'label': 'Personal Email',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'notice_number_of_days',
+		'fieldtype': 'Int',
+		'idx': 39,
+		'label': 'Notice - Number of Days',
+		'oldfieldname': 'notice_number_of_days',
+		'oldfieldtype': 'Int',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 40,
+		'label': 'Emergency Contact Details',
+		'options': 'Emergency Contact Details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'person_to_be_contacted',
+		'fieldtype': 'Data',
+		'idx': 41,
+		'label': 'Person To Be Contacted',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'relation',
+		'fieldtype': 'Data',
+		'idx': 42,
+		'label': 'Relation',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'emergency_phone_number',
+		'fieldtype': 'Data',
+		'idx': 43,
+		'label': 'Emergency Phone Number',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 44,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'permanent_accommodation_type',
+		'fieldtype': 'Select',
+		'idx': 45,
+		'label': 'Permanent Accommodation Type',
+		'options': '\nRented\nOwned',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'permanent_address',
+		'fieldtype': 'Small Text',
+		'idx': 46,
+		'label': 'Permanent Address',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'current_accommodation_type',
+		'fieldtype': 'Select',
+		'idx': 47,
+		'label': 'Current Accommodation Type',
+		'options': '\nRented\nOwned',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'current_address',
+		'fieldtype': 'Small Text',
+		'idx': 48,
+		'label': 'Current Address',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 49,
+		'label': 'Personal Details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 50,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'pan_number',
+		'fieldtype': 'Data',
+		'idx': 51,
+		'label': 'PAN Number',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'passport_number',
+		'fieldtype': 'Data',
+		'idx': 52,
+		'label': 'Passport Number',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'hidden': 1,
+		'idx': 53,
+		'label': 'Employee Profile',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'date_of_issue',
+		'fieldtype': 'Date',
+		'idx': 54,
+		'label': 'Date of Issue',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'valid_upto',
+		'fieldtype': 'Date',
+		'idx': 55,
+		'label': 'Valid Upto',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'hidden': 1,
+		'idx': 56,
+		'label': 'Salary Structure',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'place_of_issue',
+		'fieldtype': 'Data',
+		'idx': 57,
+		'label': 'Place of Issue',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'marital_status',
+		'fieldtype': 'Select',
+		'idx': 58,
+		'label': 'Marital Status',
+		'options': '\nSingle\nMarried\nDivorced\nWidowed',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'blood_group',
+		'fieldtype': 'Select',
+		'idx': 59,
+		'label': 'Blood Group',
+		'options': '\nA+\nA-\nB+\nB-\nAB+\nAB-\nO+\nO-',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 60,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Here you can maintain family details like name and occupation of parent, spouse and children',
+		'doctype': 'DocField',
+		'fieldname': 'family_background',
+		'fieldtype': 'Small Text',
+		'idx': 61,
+		'label': 'Family Background',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Here you can maintain height, weight, allergies, medical concerns etc',
+		'doctype': 'DocField',
+		'fieldname': 'health_details',
+		'fieldtype': 'Small Text',
+		'idx': 62,
+		'label': 'Health Details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 63,
+		'label': 'Educational Qualification',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'educational_qualification_details',
+		'fieldtype': 'Table',
+		'idx': 64,
+		'label': 'Educational Qualification Details',
+		'options': 'Educational Qualifications Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 65,
+		'label': 'Career History',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 66,
+		'label': 'Previous Work Experience',
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'previous_experience_details',
+		'fieldtype': 'Table',
+		'idx': 67,
+		'label': 'Previous Experience Details',
+		'options': 'Previous Experience Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 68,
+		'label': 'History In Company',
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'experience_in_company_details',
+		'fieldtype': 'Table',
+		'idx': 69,
+		'label': 'Experience In Company Details',
+		'options': 'Experience In Company Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 70,
+		'label': 'Exit',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 71,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'resignation_letter_date',
+		'fieldtype': 'Date',
+		'idx': 72,
+		'label': 'Resignation Letter Date',
+		'oldfieldname': 'resignation_letter_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'relieving_date',
+		'fieldtype': 'Date',
+		'idx': 73,
+		'in_filter': 1,
+		'label': 'Relieving Date',
+		'oldfieldname': 'relieving_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reason_for_leaving',
+		'fieldtype': 'Data',
+		'idx': 74,
+		'label': 'Reason for Leaving',
+		'oldfieldname': 'reason_for_leaving',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'leave_encashed',
+		'fieldtype': 'Select',
+		'idx': 75,
+		'label': 'Leave Encashed?',
+		'oldfieldname': 'leave_encashed',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'encashment_date',
+		'fieldtype': 'Date',
+		'idx': 76,
+		'label': 'Encashment Date',
+		'oldfieldname': 'encashment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 77,
+		'label': 'Exit Interview Details',
+		'oldfieldname': 'col_brk6',
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'held_on',
+		'fieldtype': 'Date',
+		'idx': 78,
+		'label': 'Held On',
+		'oldfieldname': 'held_on',
+		'oldfieldtype': 'Date',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reason_for_resignation',
+		'fieldtype': 'Select',
+		'idx': 79,
+		'label': 'Reason for Resignation',
+		'oldfieldname': 'reason_for_resignation',
+		'oldfieldtype': 'Select',
+		'options': '\nBetter Prospects\nHealth Concerns',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'new_workplace',
+		'fieldtype': 'Data',
+		'idx': 80,
+		'label': 'New Workplace',
+		'oldfieldname': 'new_workplace',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'feedback',
+		'fieldtype': 'Small Text',
+		'idx': 81,
+		'label': 'Feedback',
+		'oldfieldname': 'feedback',
+		'oldfieldtype': 'Text',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'file_list',
+		'fieldtype': 'Text',
+		'hidden': 1,
+		'idx': 82,
+		'label': 'File List',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 83,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/crm/doctype/enquiry_sms_detail/__init__.py b/hr/doctype/employee_profile/__init__.py
similarity index 100%
rename from crm/doctype/enquiry_sms_detail/__init__.py
rename to hr/doctype/employee_profile/__init__.py
diff --git a/payroll/doctype/employee_profile/employee_profile.js b/hr/doctype/employee_profile/employee_profile.js
similarity index 100%
rename from payroll/doctype/employee_profile/employee_profile.js
rename to hr/doctype/employee_profile/employee_profile.js
diff --git a/payroll/doctype/employee_profile/employee_profile.py b/hr/doctype/employee_profile/employee_profile.py
similarity index 100%
rename from payroll/doctype/employee_profile/employee_profile.py
rename to hr/doctype/employee_profile/employee_profile.py
diff --git a/payroll/doctype/employee_profile/employee_profile.txt b/hr/doctype/employee_profile/employee_profile.txt
similarity index 100%
rename from payroll/doctype/employee_profile/employee_profile.txt
rename to hr/doctype/employee_profile/employee_profile.txt
diff --git a/crm/doctype/follow_up/__init__.py b/hr/doctype/employment_type/__init__.py
similarity index 100%
rename from crm/doctype/follow_up/__init__.py
rename to hr/doctype/employment_type/__init__.py
diff --git a/crm/doctype/industry_type/__init__.py b/hr/doctype/employment_type/employment_type.js
similarity index 100%
rename from crm/doctype/industry_type/__init__.py
rename to hr/doctype/employment_type/employment_type.js
diff --git a/hr/doctype/employment_type/employment_type.txt b/hr/doctype/employment_type/employment_type.txt
new file mode 100644
index 0000000000..67d54d13c9
--- /dev/null
+++ b/hr/doctype/employment_type/employment_type.txt
@@ -0,0 +1,102 @@
+# DocType, Employment Type
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:00',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:employee_type_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 16
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Employment Type',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Employment Type',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'write': 1
+	},
+
+	# DocType, Employment Type
+	{
+		'doctype': 'DocType',
+		'name': 'Employment Type'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'HR User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'role': 'HR Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'employee_type_name',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Employment Type',
+		'oldfieldname': 'employee_type_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 2,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/crm/doctype/installation_note/__init__.py b/hr/doctype/expense_type/__init__.py
similarity index 100%
rename from crm/doctype/installation_note/__init__.py
rename to hr/doctype/expense_type/__init__.py
diff --git a/crm/doctype/installed_item_details/__init__.py b/hr/doctype/expense_type/expense_type.js
similarity index 100%
rename from crm/doctype/installed_item_details/__init__.py
rename to hr/doctype/expense_type/expense_type.js
diff --git a/hr/doctype/expense_type/expense_type.txt b/hr/doctype/expense_type/expense_type.txt
new file mode 100644
index 0000000000..ddf11043aa
--- /dev/null
+++ b/hr/doctype/expense_type/expense_type.txt
@@ -0,0 +1,101 @@
+# DocType, Expense Type
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-09-03 16:45:08',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'field:expense_type',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 5
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Expense Type',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Expense Type',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'write': 1
+	},
+
+	# DocType, Expense Type
+	{
+		'doctype': 'DocType',
+		'name': 'Expense Type'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'HR Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'role': 'System Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'expense_type',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'in_filter': 0,
+		'label': 'Expense Type',
+		'oldfieldname': 'expense_type',
+		'oldfieldtype': 'Data',
+		'reqd': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Small Text',
+		'idx': 2,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Small Text',
+		'width': '300px'
+	}
+]
\ No newline at end of file
diff --git a/crm/doctype/lead/__init__.py b/hr/doctype/expense_voucher/__init__.py
similarity index 100%
rename from crm/doctype/lead/__init__.py
rename to hr/doctype/expense_voucher/__init__.py
diff --git a/payroll/doctype/expense_voucher/expense_voucher.js b/hr/doctype/expense_voucher/expense_voucher.js
similarity index 100%
rename from payroll/doctype/expense_voucher/expense_voucher.js
rename to hr/doctype/expense_voucher/expense_voucher.js
diff --git a/payroll/doctype/expense_voucher/expense_voucher.py b/hr/doctype/expense_voucher/expense_voucher.py
similarity index 100%
rename from payroll/doctype/expense_voucher/expense_voucher.py
rename to hr/doctype/expense_voucher/expense_voucher.py
diff --git a/hr/doctype/expense_voucher/expense_voucher.txt b/hr/doctype/expense_voucher/expense_voucher.txt
new file mode 100644
index 0000000000..0f7812e87c
--- /dev/null
+++ b/hr/doctype/expense_voucher/expense_voucher.txt
@@ -0,0 +1,439 @@
+# DocType, Expense Voucher
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-09-03 16:45:08',
+		'docstatus': 0,
+		'modified': '2011-06-27 14:39:09',
+		'modified_by': 'Administrator',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308808105',
+		'autoname': 'EXP.######',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'HR',
+		'name': '__common__',
+		'search_fields': 'approval_status,employee,employee_name',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': 'From %(employee_name)s for %(total_claimed_amount)s (claimed)',
+		'tag_fields': 'approval_status',
+		'version': 134
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Expense Voucher',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Expense Voucher',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Expense Voucher
+	{
+		'doctype': 'DocType',
+		'name': 'Expense Voucher'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'match': 'owner',
+		'permlevel': 0,
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'permlevel': 0,
+		'role': 'HR Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'permlevel': 0,
+		'role': 'HR User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'match': 'owner',
+		'permlevel': 0,
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'permlevel': 0,
+		'role': 'HR Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'permlevel': 0,
+		'role': 'HR User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'All'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Details',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Draft',
+		'doctype': 'DocField',
+		'fieldname': 'approval_status',
+		'fieldtype': 'Select',
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'Approval Status',
+		'no_copy': 1,
+		'oldfieldname': 'approval_status',
+		'oldfieldtype': 'Select',
+		'options': '\nDraft\nSubmitted\nApproved \nRejected\nCancelled',
+		'permlevel': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'employee',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'From Employee',
+		'oldfieldname': 'employee',
+		'oldfieldtype': 'Link',
+		'options': 'Employee',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'employee_name',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Employee Name',
+		'oldfieldname': 'employee_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Select',
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'link:Company',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 7,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'posting_date',
+		'fieldtype': 'Date',
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'Posting Date',
+		'oldfieldname': 'posting_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'exp_approver',
+		'fieldtype': 'Select',
+		'idx': 9,
+		'label': 'Approver',
+		'oldfieldname': 'exp_approver',
+		'oldfieldtype': 'Select',
+		'permlevel': 0,
+		'width': '160px'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'remark',
+		'fieldtype': 'Small Text',
+		'idx': 10,
+		'label': 'Remark',
+		'no_copy': 1,
+		'oldfieldname': 'remark',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'idx': 11,
+		'label': 'Amended From',
+		'no_copy': 1,
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 1,
+		'width': '160px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'idx': 12,
+		'label': 'Amendment Date',
+		'no_copy': 1,
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 1,
+		'width': '160px'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'hidden': 1,
+		'idx': 13,
+		'label': 'Approve',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'hidden': 1,
+		'idx': 14,
+		'label': 'Reject',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 15,
+		'label': 'Expense Details',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 16,
+		'label': 'Calculate Total Amount',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'total_claimed_amount',
+		'fieldtype': 'Currency',
+		'idx': 17,
+		'in_filter': 0,
+		'label': 'Total Claimed Amount',
+		'no_copy': 1,
+		'oldfieldname': 'total_claimed_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'reqd': 0,
+		'width': '160px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'total_sanctioned_amount',
+		'fieldtype': 'Currency',
+		'idx': 18,
+		'in_filter': 0,
+		'label': 'Total Sanctioned Amount',
+		'no_copy': 1,
+		'oldfieldname': 'total_sanctioned_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'width': '160px'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'hidden': 1,
+		'idx': 19,
+		'label': 'Update Voucher',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'expense_voucher_details',
+		'fieldtype': 'Table',
+		'idx': 20,
+		'label': 'Expense Voucher Details',
+		'oldfieldname': 'expense_voucher_details',
+		'oldfieldtype': 'Table',
+		'options': 'Expense Voucher Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'email_id',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 21,
+		'label': 'Employees Email Id',
+		'oldfieldname': 'email_id',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/crm/doctype/lead_attachment_detail/__init__.py b/hr/doctype/expense_voucher_detail/__init__.py
similarity index 100%
rename from crm/doctype/lead_attachment_detail/__init__.py
rename to hr/doctype/expense_voucher_detail/__init__.py
diff --git a/hr/doctype/expense_voucher_detail/expense_voucher_detail.txt b/hr/doctype/expense_voucher_detail/expense_voucher_detail.txt
new file mode 100644
index 0000000000..d6cb015f32
--- /dev/null
+++ b/hr/doctype/expense_voucher_detail/expense_voucher_detail.txt
@@ -0,0 +1,108 @@
+# DocType, Expense Voucher Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-09-03 16:45:08',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 5
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Expense Voucher Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Expense Voucher Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Expense Voucher Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'expense_date',
+		'fieldtype': 'Date',
+		'idx': 1,
+		'label': 'Expense Date',
+		'oldfieldname': 'expense_date',
+		'oldfieldtype': 'Date',
+		'reqd': 0,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'expense_type',
+		'fieldtype': 'Link',
+		'idx': 2,
+		'label': 'Expense Type',
+		'oldfieldname': 'expense_type',
+		'oldfieldtype': 'Link',
+		'options': 'Expense Type',
+		'reqd': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Small Text',
+		'idx': 3,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Small Text',
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'claim_amount',
+		'fieldtype': 'Currency',
+		'idx': 4,
+		'label': 'Claim Amount',
+		'oldfieldname': 'claim_amount',
+		'oldfieldtype': 'Currency',
+		'reqd': 1,
+		'trigger': 'Client',
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'sanctioned_amount',
+		'fieldtype': 'Currency',
+		'idx': 5,
+		'label': 'Sanctioned Amount',
+		'no_copy': 1,
+		'oldfieldname': 'sanctioned_amount',
+		'oldfieldtype': 'Currency',
+		'trigger': 'Client',
+		'width': '150px'
+	}
+]
\ No newline at end of file
diff --git a/crm/doctype/lead_item_detail/__init__.py b/hr/doctype/experience_in_company_detail/__init__.py
similarity index 100%
rename from crm/doctype/lead_item_detail/__init__.py
rename to hr/doctype/experience_in_company_detail/__init__.py
diff --git a/hr/doctype/experience_in_company_detail/experience_in_company_detail.txt b/hr/doctype/experience_in_company_detail/experience_in_company_detail.txt
new file mode 100644
index 0000000000..c1b826bf14
--- /dev/null
+++ b/hr/doctype/experience_in_company_detail/experience_in_company_detail.txt
@@ -0,0 +1,110 @@
+# DocType, Experience In Company Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:01',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'version': 6
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Experience In Company Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Experience In Company Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Experience In Company Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'branch',
+		'fieldtype': 'Select',
+		'idx': 1,
+		'label': 'Branch',
+		'oldfieldname': 'branch',
+		'oldfieldtype': 'Select',
+		'options': 'link:Branch'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'department',
+		'fieldtype': 'Select',
+		'idx': 2,
+		'label': 'Department',
+		'oldfieldname': 'department',
+		'oldfieldtype': 'Select',
+		'options': 'link:Department'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'designation',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Designation',
+		'oldfieldname': 'designation',
+		'oldfieldtype': 'Select',
+		'options': 'link:Designation'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'grade',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'label': 'Grade',
+		'oldfieldname': 'grade',
+		'oldfieldtype': 'Select',
+		'options': 'link:Grade'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'from_date',
+		'fieldtype': 'Date',
+		'idx': 5,
+		'label': 'From Date',
+		'oldfieldname': 'from_date',
+		'oldfieldtype': 'Date'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'to_date',
+		'fieldtype': 'Date',
+		'idx': 6,
+		'label': 'To Date',
+		'oldfieldname': 'to_date',
+		'oldfieldtype': 'Date'
+	}
+]
\ No newline at end of file
diff --git a/crm/doctype/lead_sms_detail/__init__.py b/hr/doctype/grade/__init__.py
similarity index 100%
rename from crm/doctype/lead_sms_detail/__init__.py
rename to hr/doctype/grade/__init__.py
diff --git a/crm/doctype/plot_control/__init__.py b/hr/doctype/grade/grade.js
similarity index 100%
rename from crm/doctype/plot_control/__init__.py
rename to hr/doctype/grade/grade.js
diff --git a/hr/doctype/grade/grade.txt b/hr/doctype/grade/grade.txt
new file mode 100644
index 0000000000..afa74ad4c1
--- /dev/null
+++ b/hr/doctype/grade/grade.txt
@@ -0,0 +1,103 @@
+# DocType, Grade
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:03',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:grade_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 7
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Grade',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Grade',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'write': 1
+	},
+
+	# DocType, Grade
+	{
+		'doctype': 'DocType',
+		'name': 'Grade'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'HR User',
+		'submit': 0
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'role': 'HR Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'grade_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Grade',
+		'oldfieldname': 'grade_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	}
+]
\ No newline at end of file
diff --git a/crm/doctype/quotation/__init__.py b/hr/doctype/holiday_list/__init__.py
similarity index 100%
rename from crm/doctype/quotation/__init__.py
rename to hr/doctype/holiday_list/__init__.py
diff --git a/crm/doctype/quotation_detail/__init__.py b/hr/doctype/holiday_list/holiday_list.js
similarity index 100%
rename from crm/doctype/quotation_detail/__init__.py
rename to hr/doctype/holiday_list/holiday_list.js
diff --git a/payroll/doctype/holiday_list/holiday_list.py b/hr/doctype/holiday_list/holiday_list.py
similarity index 100%
rename from payroll/doctype/holiday_list/holiday_list.py
rename to hr/doctype/holiday_list/holiday_list.py
diff --git a/hr/doctype/holiday_list/holiday_list.txt b/hr/doctype/holiday_list/holiday_list.txt
new file mode 100644
index 0000000000..f9407e31ba
--- /dev/null
+++ b/hr/doctype/holiday_list/holiday_list.txt
@@ -0,0 +1,167 @@
+# DocType, Holiday List
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:03',
+		'docstatus': 0,
+		'modified': '2011-02-12 13:37:12',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 17
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Holiday List',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Holiday List',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'role': 'HR Manager'
+	},
+
+	# DocType, Holiday List
+	{
+		'doctype': 'DocType',
+		'name': 'Holiday List'
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'holiday_list_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Holiday List Name',
+		'oldfieldname': 'holiday_list_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_default',
+		'fieldtype': 'Check',
+		'idx': 3,
+		'label': 'Default',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Link',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'weekly_off',
+		'fieldtype': 'Select',
+		'idx': 5,
+		'label': 'Weekly Off',
+		'no_copy': 1,
+		'options': '\nSunday\nMonday\nTuesday\nWednesday\nThursday\nFriday\nSaturday',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 6,
+		'label': 'Get Weekly Off Dates',
+		'options': 'get_weekly_off_dates',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'holiday_list_details',
+		'fieldtype': 'Table',
+		'idx': 7,
+		'label': 'Holiday List Details',
+		'oldfieldname': 'holiday_list_details',
+		'oldfieldtype': 'Table',
+		'options': 'Holiday List Detail',
+		'permlevel': 0,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 8,
+		'label': 'Clear Table',
+		'options': 'clear_table',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/crm/doctype/return_detail/__init__.py b/hr/doctype/holiday_list_detail/__init__.py
similarity index 100%
rename from crm/doctype/return_detail/__init__.py
rename to hr/doctype/holiday_list_detail/__init__.py
diff --git a/hr/doctype/holiday_list_detail/holiday_list_detail.txt b/hr/doctype/holiday_list_detail/holiday_list_detail.txt
new file mode 100644
index 0000000000..89f1b04fbf
--- /dev/null
+++ b/hr/doctype/holiday_list_detail/holiday_list_detail.txt
@@ -0,0 +1,65 @@
+# DocType, Holiday List Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:03',
+		'docstatus': 0,
+		'modified': '2011-02-11 14:23:09',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 4
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Holiday List Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Holiday List Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Holiday List Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Description',
+		'oldfieldname': 'holiday_name',
+		'oldfieldtype': 'Data',
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'holiday_date',
+		'fieldtype': 'Date',
+		'idx': 2,
+		'label': 'Date',
+		'oldfieldname': 'holiday_date',
+		'oldfieldtype': 'Date',
+		'width': '100px'
+	}
+]
\ No newline at end of file
diff --git a/crm/doctype/sales_common/__init__.py b/hr/doctype/invest_80_declaration_detail/__init__.py
similarity index 100%
rename from crm/doctype/sales_common/__init__.py
rename to hr/doctype/invest_80_declaration_detail/__init__.py
diff --git a/hr/doctype/invest_80_declaration_detail/invest_80_declaration_detail.txt b/hr/doctype/invest_80_declaration_detail/invest_80_declaration_detail.txt
new file mode 100644
index 0000000000..841b21e0cf
--- /dev/null
+++ b/hr/doctype/invest_80_declaration_detail/invest_80_declaration_detail.txt
@@ -0,0 +1,143 @@
+# DocType, Invest 80 Declaration Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:05',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 10
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Invest 80 Declaration Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Invest 80 Declaration Detail',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'role': 'System Manager'
+	},
+
+	# DocType, Invest 80 Declaration Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Invest 80 Declaration Detail'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'particulars4',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Particulars',
+		'oldfieldname': 'particulars4',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1,
+		'reqd': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'under_section4',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Under Section',
+		'oldfieldname': 'under_section4',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'max_limit4',
+		'fieldtype': 'Currency',
+		'idx': 3,
+		'label': 'Max. Limit',
+		'oldfieldname': 'max_limit4',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'actual_amount4',
+		'fieldtype': 'Currency',
+		'idx': 4,
+		'label': 'Actual Amount',
+		'oldfieldname': 'actual_amount4',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'eligible_amount4',
+		'fieldtype': 'Currency',
+		'idx': 5,
+		'label': 'Eligible Amount',
+		'oldfieldname': 'eligible_amount4',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'modified_amount4',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'label': 'Modified Amount',
+		'oldfieldname': 'modified_amount4',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/crm/doctype/sales_order/__init__.py b/hr/doctype/it_checklist/__init__.py
similarity index 100%
rename from crm/doctype/sales_order/__init__.py
rename to hr/doctype/it_checklist/__init__.py
diff --git a/payroll/doctype/it_checklist/it_checklist.js b/hr/doctype/it_checklist/it_checklist.js
similarity index 100%
rename from payroll/doctype/it_checklist/it_checklist.js
rename to hr/doctype/it_checklist/it_checklist.js
diff --git a/payroll/doctype/it_checklist/it_checklist.py b/hr/doctype/it_checklist/it_checklist.py
similarity index 100%
rename from payroll/doctype/it_checklist/it_checklist.py
rename to hr/doctype/it_checklist/it_checklist.py
diff --git a/hr/doctype/it_checklist/it_checklist.txt b/hr/doctype/it_checklist/it_checklist.txt
new file mode 100644
index 0000000000..b28e9df25b
--- /dev/null
+++ b/hr/doctype/it_checklist/it_checklist.txt
@@ -0,0 +1,637 @@
+# DocType, IT Checklist
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:05',
+		'docstatus': 0,
+		'modified': '2010-12-30 14:53:02',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 455
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'IT Checklist',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'IT Checklist',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, IT Checklist
+	{
+		'doctype': 'DocType',
+		'name': 'IT Checklist'
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'HR User',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'HR Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 1,
+		'role': 'HR User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'HR Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 3,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Yes',
+		'doctype': 'DocField',
+		'fieldname': 'is_cheklist_active',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'label': 'Is IT Cheklist Active?',
+		'oldfieldname': 'is_cheklist_active',
+		'oldfieldtype': 'Select',
+		'options': 'Yes\nNo',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 5,
+		'label': 'Employee Information',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 6,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'employee',
+		'fieldtype': 'Link',
+		'idx': 7,
+		'label': 'Employee',
+		'oldfieldname': 'employee',
+		'oldfieldtype': 'Link',
+		'options': 'Employee',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'employee_name',
+		'fieldtype': 'Data',
+		'idx': 8,
+		'label': 'Employee Name',
+		'oldfieldname': 'employee_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'hra_count',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 9,
+		'label': 'HRA Count',
+		'no_copy': 0,
+		'oldfieldname': 'hra_count',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'metro',
+		'fieldtype': 'Select',
+		'idx': 10,
+		'label': 'Is location a metro city?',
+		'oldfieldname': 'metro',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sr_citizen',
+		'fieldtype': 'Select',
+		'idx': 11,
+		'label': 'Is senior citizen?',
+		'oldfieldname': 'sr_citizen',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'part_sr_citizen',
+		'fieldtype': 'Select',
+		'idx': 12,
+		'label': 'Parents are sr. citizen?',
+		'oldfieldname': 'part_sr_citizen',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'basic',
+		'fieldtype': 'Currency',
+		'idx': 13,
+		'label': 'Annual Basic',
+		'oldfieldname': 'basic',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'sum of earning terms',
+		'doctype': 'DocField',
+		'fieldname': 'gross_income',
+		'fieldtype': 'Currency',
+		'idx': 14,
+		'label': 'Annual Gross Income',
+		'oldfieldname': 'gross_income',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Please fill up all data then press "Done"',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 15,
+		'label': 'Done',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 16,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'rent_acc',
+		'fieldtype': 'Select',
+		'idx': 17,
+		'label': 'Having rented accomodation?',
+		'oldfieldname': 'rent_acc',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'ann_rent',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 18,
+		'label': 'Enter annual rent paid',
+		'oldfieldname': 'ann_rent',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Disability % of the Handicapped Dependents',
+		'doctype': 'DocField',
+		'fieldname': 'per_dep_dis',
+		'fieldtype': 'Select',
+		'idx': 19,
+		'label': 'Dependents Disability %',
+		'oldfieldname': 'per_dep_dis',
+		'oldfieldtype': 'Select',
+		'options': '\nLess than 80% disability\nMore than 80% disability',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'per_self_dis',
+		'fieldtype': 'Select',
+		'idx': 20,
+		'label': 'Self disability %',
+		'oldfieldname': 'per_self_dis',
+		'oldfieldtype': 'Select',
+		'options': '\nLess than 80% disability\nMore than 80% disability',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'pf',
+		'fieldtype': 'Currency',
+		'idx': 21,
+		'label': 'Annual PF',
+		'oldfieldname': 'pf',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 22,
+		'label': 'Exemptions',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 23,
+		'label': 'Exemptions1',
+		'oldfieldtype': 'HTML',
+		'options': 'Exemptions under section 10 & 17',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'exe_declaration_details',
+		'fieldtype': 'Table',
+		'idx': 24,
+		'label': 'Exemption Detail',
+		'oldfieldname': 'exe_declaration_details',
+		'oldfieldtype': 'Table',
+		'options': 'Declaration Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 25,
+		'label': 'Other Income',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'oth_inc_decl_details',
+		'fieldtype': 'Table',
+		'idx': 26,
+		'label': 'Other Income Details',
+		'oldfieldname': 'oth_inc_decl_details',
+		'oldfieldtype': 'Table',
+		'options': 'Other Income Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 27,
+		'label': 'Chapter VI A',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 28,
+		'label': 'deduction chap via',
+		'oldfieldtype': 'HTML',
+		'options': 'Deduction under Chapter VI A',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'chap_via_decl_details',
+		'fieldtype': 'Table',
+		'idx': 29,
+		'label': 'Chap VI A Details',
+		'oldfieldname': 'chap_via_decl_details',
+		'oldfieldtype': 'Table',
+		'options': 'Chapter VI A Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 30,
+		'label': '80 C',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 31,
+		'label': 'investment 80 C',
+		'oldfieldtype': 'HTML',
+		'options': 'Investment under Section 80 C & 80CCC qualifying for deduction upto RS. 1 Lac',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'invest_80_decl_details',
+		'fieldtype': 'Table',
+		'idx': 32,
+		'label': 'Invest 80 Decl Details',
+		'oldfieldname': 'invest_80_decl_details',
+		'oldfieldtype': 'Table',
+		'options': 'Invest 80 Declaration Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 33,
+		'label': 'Total Taxable Income',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 34,
+		'label': 'Calculate',
+		'oldfieldtype': 'Button',
+		'options': 'calculate_tax',
+		'permlevel': 0,
+		'trigger': 'Server'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'net_tot_tax_income',
+		'fieldtype': 'Currency',
+		'idx': 35,
+		'label': 'Net Total Taxable Income',
+		'oldfieldname': 'net_tot_tax_income',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tax_tot_income',
+		'fieldtype': 'Currency',
+		'idx': 36,
+		'label': 'Tax on Total Income',
+		'oldfieldname': 'tax_tot_income',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'edu_cess',
+		'fieldtype': 'Currency',
+		'idx': 37,
+		'label': 'Education Cess',
+		'oldfieldname': 'edu_cess',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'applicable_from',
+		'fieldtype': 'Select',
+		'idx': 38,
+		'label': 'Applicable from ',
+		'oldfieldname': 'applicable_from',
+		'oldfieldtype': 'Select',
+		'options': '\nJanuary\nFebruary\nMarch\nApril\nMay\nJune\nJuly\nAugust\nSeptember\nOctober\nNovember\nDecember',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rem_months',
+		'fieldtype': 'Select',
+		'idx': 39,
+		'label': 'Remaining month in year',
+		'oldfieldname': 'rem_months',
+		'oldfieldtype': 'Select',
+		'options': '\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 40,
+		'label': 'Calculate Tax',
+		'oldfieldtype': 'Section Break',
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 41,
+		'label': 'Calculate Monthly Tax ',
+		'oldfieldtype': 'Button',
+		'options': 'calc_tax_pm',
+		'permlevel': 0,
+		'trigger': 'Server'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tax_per_month',
+		'fieldtype': 'Currency',
+		'idx': 42,
+		'label': 'Tax per Month',
+		'oldfieldname': 'tax_per_month',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/crm/doctype/sales_order_detail/__init__.py b/hr/doctype/kra_sheet/__init__.py
similarity index 100%
rename from crm/doctype/sales_order_detail/__init__.py
rename to hr/doctype/kra_sheet/__init__.py
diff --git a/hr/doctype/kra_sheet/kra_sheet.txt b/hr/doctype/kra_sheet/kra_sheet.txt
new file mode 100644
index 0000000000..a1e466b2ac
--- /dev/null
+++ b/hr/doctype/kra_sheet/kra_sheet.txt
@@ -0,0 +1,68 @@
+# DocType, KRA Sheet
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-09-01 15:48:06',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'KSHEET.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 6
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'KRA Sheet',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocType, KRA Sheet
+	{
+		'doctype': 'DocType',
+		'name': 'KRA Sheet'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Key Performance Area',
+		'doctype': 'DocField',
+		'fieldname': 'kra',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'KRA',
+		'oldfieldname': 'kra',
+		'oldfieldtype': 'Small Text',
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'per_weightage',
+		'fieldtype': 'Currency',
+		'idx': 2,
+		'label': 'Weightage (%)',
+		'oldfieldname': 'per_weightage',
+		'oldfieldtype': 'Currency',
+		'width': '100px'
+	}
+]
\ No newline at end of file
diff --git a/crm/doctype/sales_team/__init__.py b/hr/doctype/kra_template/__init__.py
similarity index 100%
rename from crm/doctype/sales_team/__init__.py
rename to hr/doctype/kra_template/__init__.py
diff --git a/crm/doctype/shipping_address/__init__.py b/hr/doctype/kra_template/kra_template.js
old mode 100755
new mode 100644
similarity index 100%
rename from crm/doctype/shipping_address/__init__.py
rename to hr/doctype/kra_template/kra_template.js
diff --git a/hr/doctype/kra_template/kra_template.txt b/hr/doctype/kra_template/kra_template.txt
new file mode 100644
index 0000000000..55189266f6
--- /dev/null
+++ b/hr/doctype/kra_template/kra_template.txt
@@ -0,0 +1,115 @@
+# DocType, KRA Template
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-09-01 15:48:06',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'field:kra_title',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 3
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'KRA Template',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'KRA Template',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'write': 1
+	},
+
+	# DocType, KRA Template
+	{
+		'doctype': 'DocType',
+		'name': 'KRA Template'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'role': 'HR Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'role': 'HR User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'System Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'kra_title',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'KRA Title',
+		'oldfieldname': 'kra_title',
+		'oldfieldtype': 'Data',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Small Text',
+		'idx': 2,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Small Text',
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'kra_sheet',
+		'fieldtype': 'Table',
+		'idx': 3,
+		'label': 'KRA Sheet',
+		'oldfieldname': 'kra_sheet',
+		'oldfieldtype': 'Table',
+		'options': 'KRA Sheet'
+	}
+]
\ No newline at end of file
diff --git a/crm/doctype/sms_center/__init__.py b/hr/doctype/leave_allocation/__init__.py
old mode 100644
new mode 100755
similarity index 100%
rename from crm/doctype/sms_center/__init__.py
rename to hr/doctype/leave_allocation/__init__.py
diff --git a/payroll/doctype/leave_allocation/leave_allocation.js b/hr/doctype/leave_allocation/leave_allocation.js
similarity index 100%
rename from payroll/doctype/leave_allocation/leave_allocation.js
rename to hr/doctype/leave_allocation/leave_allocation.js
diff --git a/payroll/doctype/leave_allocation/leave_allocation.py b/hr/doctype/leave_allocation/leave_allocation.py
similarity index 100%
rename from payroll/doctype/leave_allocation/leave_allocation.py
rename to hr/doctype/leave_allocation/leave_allocation.py
diff --git a/hr/doctype/leave_allocation/leave_allocation.txt b/hr/doctype/leave_allocation/leave_allocation.txt
new file mode 100644
index 0000000000..0b0c96c25d
--- /dev/null
+++ b/hr/doctype/leave_allocation/leave_allocation.txt
@@ -0,0 +1,293 @@
+# DocType, Leave Allocation
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2011-02-10 17:24:59',
+		'docstatus': 0,
+		'modified': '2011-02-17 13:47:13',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1299063937',
+		'autoname': 'LAL/.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'HR',
+		'name': '__common__',
+		'search_fields': 'employee,employee_name,leave_type,total_leaves_allocated,fiscal_year',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 1565
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Leave Allocation',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Leave Allocation',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Leave Allocation
+	{
+		'doctype': 'DocType',
+		'name': 'Leave Allocation'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'match': 'owner',
+		'permlevel': 0,
+		'role': 'HR User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'match': 'owner',
+		'permlevel': 0,
+		'role': 'HR User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'HR Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'HR Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'column_break1',
+		'fieldtype': 'Column Break',
+		'idx': 1,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'employee',
+		'fieldtype': 'Link',
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'Employee',
+		'oldfieldname': 'employee',
+		'oldfieldtype': 'Link',
+		'options': 'Employee',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'employee_name',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Employee Name',
+		'permlevel': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'leave_type',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Leave Type',
+		'oldfieldname': 'leave_type',
+		'oldfieldtype': 'Link',
+		'options': '\nCasual Leave\nCompensatory Off\nLeave Without Pay\nPaternity Leave\nPrivilege Leave\nSick Leave',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Today',
+		'doctype': 'DocField',
+		'fieldname': 'posting_date',
+		'fieldtype': 'Date',
+		'hidden': 0,
+		'idx': 5,
+		'label': 'Posting Date',
+		'no_copy': 1,
+		'oldfieldname': 'date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'reqd': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Data',
+		'options': '\n2010-2011\n2011-2012\n2012-2013',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Small Text',
+		'hidden': 0,
+		'idx': 7,
+		'label': 'Description',
+		'oldfieldname': 'reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'column_break8',
+		'fieldtype': 'Column Break',
+		'idx': 8,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'carry_forward',
+		'fieldtype': 'Check',
+		'idx': 9,
+		'label': 'Carry Forward',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'carry_forwarded_leaves',
+		'fieldtype': 'Currency',
+		'idx': 10,
+		'label': 'Carry Forwarded Leaves',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'new_leaves_allocated',
+		'fieldtype': 'Currency',
+		'idx': 11,
+		'label': 'New Leaves Allocated',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'total_leaves_allocated',
+		'fieldtype': 'Currency',
+		'idx': 12,
+		'label': 'Total Leaves Allocated',
+		'permlevel': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 13,
+		'label': 'Amended From',
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'description': 'The date at which current entry is corrected in the system.',
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'hidden': 0,
+		'idx': 14,
+		'label': 'Amendment Date',
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/crm/page/__init__.py b/hr/doctype/leave_application/__init__.py
old mode 100644
new mode 100755
similarity index 100%
rename from crm/page/__init__.py
rename to hr/doctype/leave_application/__init__.py
diff --git a/payroll/doctype/leave_application/leave_application.js b/hr/doctype/leave_application/leave_application.js
similarity index 100%
rename from payroll/doctype/leave_application/leave_application.js
rename to hr/doctype/leave_application/leave_application.js
diff --git a/payroll/doctype/leave_application/leave_application.py b/hr/doctype/leave_application/leave_application.py
similarity index 100%
rename from payroll/doctype/leave_application/leave_application.py
rename to hr/doctype/leave_application/leave_application.py
diff --git a/hr/doctype/leave_application/leave_application.txt b/hr/doctype/leave_application/leave_application.txt
new file mode 100644
index 0000000000..a95f4ce89a
--- /dev/null
+++ b/hr/doctype/leave_application/leave_application.txt
@@ -0,0 +1,297 @@
+# DocType, Leave Application
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2011-02-10 14:10:08',
+		'docstatus': 0,
+		'modified': '2011-02-17 13:44:37',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1305714022',
+		'autoname': 'LAP/.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Transaction',
+		'module': 'HR',
+		'name': '__common__',
+		'search_fields': 'employee,employee_name,leave_type,from_date,to_date,total_leave_days,fiscal_year',
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'subject': 'From %(employee_name)s, %(designation)s',
+		'tag_fields': 'leave_type',
+		'version': 18
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Leave Application',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Leave Application',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Leave Application
+	{
+		'doctype': 'DocType',
+		'name': 'Leave Application'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'match': 'owner',
+		'permlevel': 0,
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'match': 'owner',
+		'permlevel': 0,
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'HR User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'HR Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 1,
+		'role': 'HR User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'HR Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'column_break1',
+		'fieldtype': 'Column Break',
+		'idx': 1,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'employee',
+		'fieldtype': 'Link',
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'Employee',
+		'options': 'Employee',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'employee_name',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Employee Name',
+		'permlevel': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'leave_type',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Leave Type',
+		'options': 'link:Leave Type',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'leave_balance',
+		'fieldtype': 'Currency',
+		'idx': 5,
+		'label': 'Leave Balance',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Today',
+		'doctype': 'DocField',
+		'fieldname': 'posting_date',
+		'fieldtype': 'Date',
+		'idx': 6,
+		'label': 'Posting Date',
+		'no_copy': 1,
+		'permlevel': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 7,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'column_break8',
+		'fieldtype': 'Column Break',
+		'idx': 8,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'half_day',
+		'fieldtype': 'Check',
+		'idx': 9,
+		'label': 'Half Day',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'from_date',
+		'fieldtype': 'Date',
+		'idx': 10,
+		'label': 'From Date',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'to_date',
+		'fieldtype': 'Date',
+		'idx': 11,
+		'label': 'To Date',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'total_leave_days',
+		'fieldtype': 'Currency',
+		'idx': 12,
+		'label': 'Total Leave Days',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Small Text',
+		'idx': 13,
+		'label': 'Description',
+		'permlevel': 0,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'idx': 14,
+		'label': 'Amended From',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'idx': 15,
+		'label': 'Amendment Date',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/crm/page/customers/__init__.py b/hr/doctype/leave_control_panel/__init__.py
similarity index 100%
rename from crm/page/customers/__init__.py
rename to hr/doctype/leave_control_panel/__init__.py
diff --git a/payroll/doctype/leave_control_panel/leave_control_panel.js b/hr/doctype/leave_control_panel/leave_control_panel.js
similarity index 100%
rename from payroll/doctype/leave_control_panel/leave_control_panel.js
rename to hr/doctype/leave_control_panel/leave_control_panel.js
diff --git a/payroll/doctype/leave_control_panel/leave_control_panel.py b/hr/doctype/leave_control_panel/leave_control_panel.py
similarity index 100%
rename from payroll/doctype/leave_control_panel/leave_control_panel.py
rename to hr/doctype/leave_control_panel/leave_control_panel.py
diff --git a/hr/doctype/leave_control_panel/leave_control_panel.txt b/hr/doctype/leave_control_panel/leave_control_panel.txt
new file mode 100644
index 0000000000..29999de869
--- /dev/null
+++ b/hr/doctype/leave_control_panel/leave_control_panel.txt
@@ -0,0 +1,244 @@
+# DocType, Leave Control Panel
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:08',
+		'docstatus': 0,
+		'modified': '2011-02-12 15:42:00',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_copy': 1,
+		'allow_email': 1,
+		'allow_print': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'hide_heading': 0,
+		'hide_toolbar': 0,
+		'issingle': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'read_only': 1,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 161
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Leave Control Panel',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Leave Control Panel',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Leave Control Panel
+	{
+		'doctype': 'DocType',
+		'name': 'Leave Control Panel'
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'HR User',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'HR Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 1,
+		'role': 'HR User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'HR Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'column_break1',
+		'fieldtype': 'Column Break',
+		'idx': 1,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Leave blank if considered for all employee types',
+		'doctype': 'DocField',
+		'fieldname': 'employee_type',
+		'fieldtype': 'Select',
+		'idx': 2,
+		'label': 'Employee Type',
+		'options': 'link:Employment Type'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Leave blank if considered for all branches',
+		'doctype': 'DocField',
+		'fieldname': 'branch',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Branch',
+		'options': 'link:Branch'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Leave blank if considered for all departments',
+		'doctype': 'DocField',
+		'fieldname': 'department',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'label': 'Department',
+		'options': 'link:Department'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Leave blank if considered for all designations',
+		'doctype': 'DocField',
+		'fieldname': 'designation',
+		'fieldtype': 'Select',
+		'idx': 5,
+		'label': 'Designation',
+		'options': 'link:Designation'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Leave blank if considered for all grades',
+		'doctype': 'DocField',
+		'fieldname': 'grade',
+		'fieldtype': 'Select',
+		'idx': 6,
+		'label': 'Grade',
+		'options': 'link:Grade'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'column_break7',
+		'fieldtype': 'Column Break',
+		'idx': 7,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'options': 'link:Fiscal Year',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'leave_type',
+		'fieldtype': 'Select',
+		'idx': 9,
+		'label': 'Leave Type',
+		'options': 'link:Leave Type',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': "Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year",
+		'doctype': 'DocField',
+		'fieldname': 'carry_forward',
+		'fieldtype': 'Check',
+		'idx': 10,
+		'label': 'Carry Forward'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'no_of_days',
+		'fieldtype': 'Currency',
+		'idx': 11,
+		'label': 'New Leaves Allocated (In Days)',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 12,
+		'label': 'Allocate',
+		'options': 'allocate_leave',
+		'trigger': 'Server'
+	}
+]
\ No newline at end of file
diff --git a/crm/page/sales_browser/__init__.py b/hr/doctype/leave_type/__init__.py
similarity index 100%
rename from crm/page/sales_browser/__init__.py
rename to hr/doctype/leave_type/__init__.py
diff --git a/crm/doctype/sms_center/sms_center.js b/hr/doctype/leave_type/leave_type.js
similarity index 100%
rename from crm/doctype/sms_center/sms_center.js
rename to hr/doctype/leave_type/leave_type.js
diff --git a/hr/doctype/leave_type/leave_type.txt b/hr/doctype/leave_type/leave_type.txt
new file mode 100644
index 0000000000..fb9aafdac9
--- /dev/null
+++ b/hr/doctype/leave_type/leave_type.txt
@@ -0,0 +1,152 @@
+# DocType, Leave Type
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:08',
+		'docstatus': 0,
+		'modified': '2011-02-10 17:05:15',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:leave_type_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 23
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Leave Type',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Leave Type',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'write': 1
+	},
+
+	# DocType, Leave Type
+	{
+		'doctype': 'DocType',
+		'name': 'Leave Type'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'HR User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'role': 'HR Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'leave_type_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Leave Type Name',
+		'oldfieldname': 'leave_type_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'max_days_allowed',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Max Days Leave Allowed',
+		'oldfieldname': 'max_days_allowed',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_carry_forward',
+		'fieldtype': 'Check',
+		'idx': 4,
+		'label': 'Is Carry Forward',
+		'oldfieldname': 'is_carry_forward',
+		'oldfieldtype': 'Check',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_encash',
+		'fieldtype': 'Check',
+		'hidden': 1,
+		'idx': 5,
+		'label': 'Is Encash',
+		'oldfieldname': 'is_encash',
+		'oldfieldtype': 'Check',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_lwp',
+		'fieldtype': 'Check',
+		'idx': 6,
+		'label': 'Is LWP',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/crm/page/sales_dashboard/__init__.py b/hr/doctype/other_income_detail/__init__.py
similarity index 100%
rename from crm/page/sales_dashboard/__init__.py
rename to hr/doctype/other_income_detail/__init__.py
diff --git a/hr/doctype/other_income_detail/other_income_detail.txt b/hr/doctype/other_income_detail/other_income_detail.txt
new file mode 100644
index 0000000000..232427dbf9
--- /dev/null
+++ b/hr/doctype/other_income_detail/other_income_detail.txt
@@ -0,0 +1,141 @@
+# DocType, Other Income Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:11',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 6
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Other Income Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Other Income Detail',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'role': 'System Manager'
+	},
+
+	# DocType, Other Income Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Other Income Detail'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'particulars2',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Particulars',
+		'oldfieldname': 'particulars2',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1,
+		'reqd': 1,
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'under_section2',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Under Section',
+		'oldfieldname': 'under_section2',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'max_limit2',
+		'fieldtype': 'Currency',
+		'idx': 3,
+		'label': 'Max. Limit',
+		'oldfieldname': 'max_limit2',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'actual_amount2',
+		'fieldtype': 'Currency',
+		'idx': 4,
+		'label': 'Actual Amount',
+		'oldfieldname': 'actual_amount2',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'eligible_amount2',
+		'fieldtype': 'Currency',
+		'idx': 5,
+		'label': 'Eligible Amount',
+		'oldfieldname': 'eligible_amount2',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'modified_amount2',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'label': 'Modified Amount',
+		'oldfieldname': 'modified_amount2',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/crm/search_criteria/__init__.py b/hr/doctype/payroll_rule/__init__.py
similarity index 100%
rename from crm/search_criteria/__init__.py
rename to hr/doctype/payroll_rule/__init__.py
diff --git a/payroll/doctype/payroll_rule/payroll_rule.js b/hr/doctype/payroll_rule/payroll_rule.js
similarity index 100%
rename from payroll/doctype/payroll_rule/payroll_rule.js
rename to hr/doctype/payroll_rule/payroll_rule.js
diff --git a/payroll/doctype/payroll_rule/payroll_rule.py b/hr/doctype/payroll_rule/payroll_rule.py
similarity index 100%
rename from payroll/doctype/payroll_rule/payroll_rule.py
rename to hr/doctype/payroll_rule/payroll_rule.py
diff --git a/payroll/doctype/payroll_rule/payroll_rule.txt b/hr/doctype/payroll_rule/payroll_rule.txt
similarity index 100%
rename from payroll/doctype/payroll_rule/payroll_rule.txt
rename to hr/doctype/payroll_rule/payroll_rule.txt
diff --git a/crm/search_criteria/delivered_items_to_be_install/__init__.py b/hr/doctype/previous_experience_detail/__init__.py
similarity index 100%
rename from crm/search_criteria/delivered_items_to_be_install/__init__.py
rename to hr/doctype/previous_experience_detail/__init__.py
diff --git a/hr/doctype/previous_experience_detail/previous_experience_detail.txt b/hr/doctype/previous_experience_detail/previous_experience_detail.txt
new file mode 100644
index 0000000000..4cce7239f3
--- /dev/null
+++ b/hr/doctype/previous_experience_detail/previous_experience_detail.txt
@@ -0,0 +1,127 @@
+# DocType, Previous Experience Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:13',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 3
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Previous Experience Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'Previous Experience Detail',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'All',
+		'write': 1
+	},
+
+	# DocType, Previous Experience Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Previous Experience Detail'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company_name',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Company',
+		'oldfieldname': 'company_name',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'designation',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Designation',
+		'oldfieldname': 'designation',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'salary',
+		'fieldtype': 'Currency',
+		'idx': 3,
+		'label': 'Salary',
+		'oldfieldname': 'salary',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'address',
+		'fieldtype': 'Small Text',
+		'idx': 4,
+		'label': 'Address',
+		'oldfieldname': 'address',
+		'oldfieldtype': 'Small Text'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact',
+		'fieldtype': 'Data',
+		'idx': 5,
+		'label': 'Contact',
+		'oldfieldname': 'contact',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'total_experience',
+		'fieldtype': 'Data',
+		'idx': 6,
+		'label': 'Total Experience',
+		'oldfieldname': 'total_experience',
+		'oldfieldtype': 'Data'
+	}
+]
\ No newline at end of file
diff --git a/crm/search_criteria/delivery_note_itemwise_pending_to_bill/__init__.py b/hr/doctype/professional_training_details/__init__.py
similarity index 100%
rename from crm/search_criteria/delivery_note_itemwise_pending_to_bill/__init__.py
rename to hr/doctype/professional_training_details/__init__.py
diff --git a/hr/doctype/professional_training_details/professional_training_details.txt b/hr/doctype/professional_training_details/professional_training_details.txt
new file mode 100644
index 0000000000..c94c6c508d
--- /dev/null
+++ b/hr/doctype/professional_training_details/professional_training_details.txt
@@ -0,0 +1,100 @@
+# DocType, Professional Training Details
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:14',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 5
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Professional Training Details',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Professional Training Details
+	{
+		'doctype': 'DocType',
+		'name': 'Professional Training Details'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'institute',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Institute / Conducted By',
+		'oldfieldname': 'institute',
+		'oldfieldtype': 'Small Text',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'nature_of_training',
+		'fieldtype': 'Small Text',
+		'idx': 2,
+		'label': 'Program / Seminar Title',
+		'oldfieldname': 'nature_of_training',
+		'oldfieldtype': 'Small Text',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'duration',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Duration',
+		'oldfieldname': 'duration',
+		'oldfieldtype': 'Data',
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'loc',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'Location',
+		'oldfieldname': 'loc',
+		'oldfieldtype': 'Data',
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'certificate',
+		'fieldtype': 'Small Text',
+		'idx': 5,
+		'label': 'Certificate',
+		'oldfieldname': 'certificate',
+		'oldfieldtype': 'Small Text'
+	}
+]
\ No newline at end of file
diff --git a/crm/search_criteria/draft_sales_orders/__init__.py b/hr/doctype/salary_slip/__init__.py
similarity index 100%
rename from crm/search_criteria/draft_sales_orders/__init__.py
rename to hr/doctype/salary_slip/__init__.py
diff --git a/payroll/doctype/salary_slip/salary_slip.js b/hr/doctype/salary_slip/salary_slip.js
similarity index 100%
rename from payroll/doctype/salary_slip/salary_slip.js
rename to hr/doctype/salary_slip/salary_slip.js
diff --git a/payroll/doctype/salary_slip/salary_slip.py b/hr/doctype/salary_slip/salary_slip.py
similarity index 100%
rename from payroll/doctype/salary_slip/salary_slip.py
rename to hr/doctype/salary_slip/salary_slip.py
diff --git a/hr/doctype/salary_slip/salary_slip.txt b/hr/doctype/salary_slip/salary_slip.txt
new file mode 100644
index 0000000000..c9ba1dea3a
--- /dev/null
+++ b/hr/doctype/salary_slip/salary_slip.txt
@@ -0,0 +1,684 @@
+# DocType, Salary Slip
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:20',
+		'docstatus': 0,
+		'modified': '2011-06-27 14:39:16',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308808105',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': 'For %(employee_name)s, %(designation)s',
+		'version': 388
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Salary Slip',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Salary Slip',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Salary Slip
+	{
+		'doctype': 'DocType',
+		'name': 'Salary Slip'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'match': 'owner',
+		'permlevel': 0,
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'match': 'owner',
+		'permlevel': 0,
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'match': 'owner',
+		'permlevel': 0,
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'match': 'owner',
+		'permlevel': 0,
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'HR User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'HR Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 1,
+		'role': 'HR User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'HR Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Basic Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 2,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'employee',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Employee',
+		'oldfieldname': 'employee',
+		'oldfieldtype': 'Link',
+		'options': 'Employee',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'employee_name',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Employee Name',
+		'oldfieldname': 'employee_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'department',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Department',
+		'oldfieldname': 'department',
+		'oldfieldtype': 'Link',
+		'options': 'Department',
+		'permlevel': 1,
+		'reqd': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'designation',
+		'fieldtype': 'Link',
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Designation',
+		'oldfieldname': 'designation',
+		'oldfieldtype': 'Link',
+		'options': 'Designation',
+		'permlevel': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'branch',
+		'fieldtype': 'Link',
+		'idx': 7,
+		'in_filter': 1,
+		'label': 'Branch',
+		'oldfieldname': 'branch',
+		'oldfieldtype': 'Link',
+		'options': 'Branch',
+		'permlevel': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'grade',
+		'fieldtype': 'Link',
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'Grade',
+		'oldfieldname': 'grade',
+		'oldfieldtype': 'Link',
+		'options': 'Grade',
+		'permlevel': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'pf_no',
+		'fieldtype': 'Data',
+		'idx': 9,
+		'label': 'PF No.',
+		'oldfieldname': 'pf_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'esic_no',
+		'fieldtype': 'Data',
+		'idx': 10,
+		'label': 'ESIC No.',
+		'oldfieldname': 'esic_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'letter_head',
+		'fieldtype': 'Link',
+		'idx': 11,
+		'label': 'Letter Head',
+		'options': 'Letter Head',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'letter_head',
+		'fieldtype': 'Link',
+		'idx': 11,
+		'label': 'Letter Head',
+		'options': 'Letter Head',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'letter_head',
+		'fieldtype': 'Link',
+		'idx': 11,
+		'label': 'Letter Head',
+		'options': 'Letter Head',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 12,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Link',
+		'idx': 13,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Data',
+		'options': 'Fiscal Year',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Select',
+		'idx': 14,
+		'in_filter': 1,
+		'label': 'Company',
+		'options': 'link:Company',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Select',
+		'idx': 14,
+		'in_filter': 1,
+		'label': 'Company',
+		'options': 'link:Company',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Select',
+		'idx': 14,
+		'in_filter': 1,
+		'label': 'Company',
+		'options': 'link:Company',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'month',
+		'fieldtype': 'Select',
+		'idx': 15,
+		'in_filter': 1,
+		'label': 'Month',
+		'oldfieldname': 'month',
+		'oldfieldtype': 'Select',
+		'options': '\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client',
+		'width': '37%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'total_days_in_month',
+		'fieldtype': 'Int',
+		'idx': 16,
+		'label': 'Total days in month',
+		'oldfieldname': 'total_days_in_month',
+		'oldfieldtype': 'Int',
+		'permlevel': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'leave_without_pay',
+		'fieldtype': 'Currency',
+		'idx': 17,
+		'label': 'Leave Without Pay',
+		'oldfieldname': 'leave_without_pay',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'payment_days',
+		'fieldtype': 'Float',
+		'idx': 18,
+		'label': 'Payment days',
+		'oldfieldname': 'payment_days',
+		'oldfieldtype': 'Float',
+		'permlevel': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'bank_name',
+		'fieldtype': 'Data',
+		'idx': 19,
+		'label': 'Bank Name',
+		'oldfieldname': 'bank_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'bank_account_no',
+		'fieldtype': 'Data',
+		'idx': 20,
+		'label': 'Bank Account No.',
+		'oldfieldname': 'bank_account_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'email_check',
+		'fieldtype': 'Check',
+		'idx': 21,
+		'label': 'Email',
+		'no_copy': 1,
+		'oldfieldname': 'email_check',
+		'oldfieldtype': 'Check',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 22,
+		'label': 'Amended From',
+		'no_copy': 1,
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'hidden': 0,
+		'idx': 23,
+		'label': 'Amendment Date',
+		'no_copy': 1,
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 24,
+		'label': 'Earning & Deduction',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 25,
+		'label': 'Earning',
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'reqd': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'earning_details',
+		'fieldtype': 'Table',
+		'idx': 26,
+		'label': 'Earning Details',
+		'oldfieldname': 'earning_details',
+		'oldfieldtype': 'Table',
+		'options': 'SS Earning Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 27,
+		'label': 'Deduction',
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'deduction_details',
+		'fieldtype': 'Table',
+		'idx': 28,
+		'label': 'Deduction Details',
+		'oldfieldname': 'deduction_details',
+		'oldfieldtype': 'Table',
+		'options': 'SS Deduction Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 29,
+		'label': 'Totals',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 30,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'arrear_amount',
+		'fieldtype': 'Currency',
+		'idx': 31,
+		'label': 'Arrear Amount',
+		'oldfieldname': 'arrear_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'leave_encashment_amount',
+		'fieldtype': 'Currency',
+		'idx': 32,
+		'label': 'Leave Encashment Amount',
+		'oldfieldname': 'encashment_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'gross_pay',
+		'fieldtype': 'Currency',
+		'idx': 33,
+		'label': 'Gross Pay',
+		'oldfieldname': 'gross_pay',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'total_deduction',
+		'fieldtype': 'Currency',
+		'idx': 34,
+		'label': 'Total Deduction',
+		'oldfieldname': 'total_deduction',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 35,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Gross Pay + Arrear Amount +Encashment Amount - Total Deduction',
+		'doctype': 'DocField',
+		'fieldname': 'net_pay',
+		'fieldtype': 'Currency',
+		'idx': 36,
+		'label': 'Net Pay',
+		'oldfieldname': 'net_pay',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rounded_total',
+		'fieldtype': 'Currency',
+		'idx': 37,
+		'label': 'Rounded Total',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'description': 'Net Pay (in words) will be visible once you save the Salary Slip.',
+		'doctype': 'DocField',
+		'fieldname': 'total_in_words',
+		'fieldtype': 'Data',
+		'idx': 38,
+		'label': 'Total in words',
+		'oldfieldname': 'net_pay_in_words',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/crm/search_criteria/follow_up_report/__init__.py b/hr/doctype/salary_slip_control_panel/__init__.py
similarity index 100%
rename from crm/search_criteria/follow_up_report/__init__.py
rename to hr/doctype/salary_slip_control_panel/__init__.py
diff --git a/payroll/doctype/salary_slip_control_panel/salary_slip_control_panel.js b/hr/doctype/salary_slip_control_panel/salary_slip_control_panel.js
similarity index 100%
rename from payroll/doctype/salary_slip_control_panel/salary_slip_control_panel.js
rename to hr/doctype/salary_slip_control_panel/salary_slip_control_panel.js
diff --git a/payroll/doctype/salary_slip_control_panel/salary_slip_control_panel.py b/hr/doctype/salary_slip_control_panel/salary_slip_control_panel.py
similarity index 100%
rename from payroll/doctype/salary_slip_control_panel/salary_slip_control_panel.py
rename to hr/doctype/salary_slip_control_panel/salary_slip_control_panel.py
diff --git a/hr/doctype/salary_slip_control_panel/salary_slip_control_panel.txt b/hr/doctype/salary_slip_control_panel/salary_slip_control_panel.txt
new file mode 100644
index 0000000000..b83e0c771b
--- /dev/null
+++ b/hr/doctype/salary_slip_control_panel/salary_slip_control_panel.txt
@@ -0,0 +1,286 @@
+# DocType, Salary Slip Control Panel
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:20',
+		'docstatus': 0,
+		'modified': '2010-12-29 18:02:38',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1294312182',
+		'allow_copy': 1,
+		'allow_email': 1,
+		'allow_print': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'hide_heading': 0,
+		'hide_toolbar': 0,
+		'in_create': 0,
+		'issingle': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'read_only': 1,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'use_template': 0,
+		'version': 113
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Salary Slip Control Panel',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Salary Slip Control Panel',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'write': 1
+	},
+
+	# DocType, Salary Slip Control Panel
+	{
+		'doctype': 'DocType',
+		'name': 'Salary Slip Control Panel'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'HR User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'role': 'HR Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Salary Slip Control Panel'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'employee_type',
+		'fieldtype': 'Select',
+		'idx': 2,
+		'label': 'Employment Type',
+		'oldfieldname': 'employee_type',
+		'oldfieldtype': 'Select',
+		'options': 'link:Employment Type'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'grade',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Grade',
+		'oldfieldname': 'grade',
+		'oldfieldtype': 'Select',
+		'options': 'link:Grade'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'branch',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'label': 'Branch',
+		'oldfieldname': 'branch',
+		'oldfieldtype': 'Select',
+		'options': 'link:Branch'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'department',
+		'fieldtype': 'Select',
+		'idx': 5,
+		'label': 'Department',
+		'oldfieldname': 'department',
+		'oldfieldtype': 'Select',
+		'options': 'link:Department'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'designation',
+		'fieldtype': 'Select',
+		'idx': 6,
+		'label': 'Designation',
+		'oldfieldname': 'designation',
+		'oldfieldtype': 'Select',
+		'options': 'link:Designation'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 7,
+		'oldfieldtype': 'Column Break'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'month',
+		'fieldtype': 'Select',
+		'idx': 9,
+		'label': 'Month',
+		'oldfieldname': 'month',
+		'oldfieldtype': 'Select',
+		'options': '\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'year',
+		'fieldtype': 'Select',
+		'idx': 10,
+		'label': 'Year',
+		'oldfieldname': 'year',
+		'oldfieldtype': 'Select',
+		'options': '\n2009\n2010\n2011\n2012'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'week_off',
+		'fieldtype': 'Currency',
+		'idx': 11,
+		'label': 'Week Off',
+		'oldfieldname': 'week_off',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'arrear_amount',
+		'fieldtype': 'Currency',
+		'idx': 12,
+		'label': 'Arrear Amount',
+		'oldfieldname': 'arrear_amount',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'email_check',
+		'fieldtype': 'Check',
+		'idx': 13,
+		'label': 'Email',
+		'oldfieldname': 'email_check',
+		'oldfieldtype': 'Check'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 14,
+		'oldfieldtype': 'Section Break'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 15,
+		'label': 'Process Payroll',
+		'oldfieldtype': 'Button',
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 16,
+		'label': 'Salary Slip HTML'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 17
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 18,
+		'label': 'Submit Salary Slip',
+		'oldfieldtype': 'Button',
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 19,
+		'label': 'Make Bank Voucher',
+		'trigger': 'Client'
+	}
+]
\ No newline at end of file
diff --git a/crm/search_criteria/gross_profit/__init__.py b/hr/doctype/salary_structure/__init__.py
similarity index 100%
rename from crm/search_criteria/gross_profit/__init__.py
rename to hr/doctype/salary_structure/__init__.py
diff --git a/payroll/doctype/salary_structure/salary_structure.js b/hr/doctype/salary_structure/salary_structure.js
similarity index 100%
rename from payroll/doctype/salary_structure/salary_structure.js
rename to hr/doctype/salary_structure/salary_structure.js
diff --git a/payroll/doctype/salary_structure/salary_structure.py b/hr/doctype/salary_structure/salary_structure.py
similarity index 100%
rename from payroll/doctype/salary_structure/salary_structure.py
rename to hr/doctype/salary_structure/salary_structure.py
diff --git a/hr/doctype/salary_structure/salary_structure.txt b/hr/doctype/salary_structure/salary_structure.txt
new file mode 100644
index 0000000000..3dcb8f9104
--- /dev/null
+++ b/hr/doctype/salary_structure/salary_structure.txt
@@ -0,0 +1,483 @@
+# DocType, Salary Structure
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-12-14 16:50:05',
+		'docstatus': 0,
+		'modified': '2011-06-27 14:39:11',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308808105',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': 'For %(employee_name)s',
+		'version': 586
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Salary Structure',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Salary Structure',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Salary Structure
+	{
+		'doctype': 'DocType',
+		'name': 'Salary Structure'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'match': 'owner',
+		'permlevel': 0,
+		'read': 1,
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'match': 'owner',
+		'permlevel': 0,
+		'read': 1,
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'match': 'owner',
+		'permlevel': 0,
+		'read': 1,
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'match': 'owner',
+		'permlevel': 0,
+		'read': 1,
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'permlevel': 0,
+		'role': 'Sales User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'read': 1,
+		'role': 'All',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'read': 1,
+		'role': 'HR User',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'read': 1,
+		'role': 'HR Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 1,
+		'read': 1,
+		'role': 'HR Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'read': 1,
+		'role': 'HR User'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Basic Info',
+		'oldfieldname': 'basic_info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 2,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'employee',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Employee',
+		'oldfieldname': 'employee',
+		'oldfieldtype': 'Link',
+		'options': 'Employee',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'employee_name',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'Employee Name',
+		'oldfieldname': 'employee_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'branch',
+		'fieldtype': 'Select',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Branch',
+		'oldfieldname': 'branch',
+		'oldfieldtype': 'Select',
+		'options': 'link:Branch',
+		'permlevel': 1,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'designation',
+		'fieldtype': 'Select',
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Designation',
+		'oldfieldname': 'designation',
+		'oldfieldtype': 'Select',
+		'options': 'link:Designation',
+		'permlevel': 1,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'department',
+		'fieldtype': 'Select',
+		'idx': 7,
+		'in_filter': 1,
+		'label': 'Department',
+		'oldfieldname': 'department',
+		'oldfieldtype': 'Select',
+		'options': 'link:Department',
+		'permlevel': 1,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'grade',
+		'fieldtype': 'Select',
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'Grade',
+		'oldfieldname': 'grade',
+		'oldfieldtype': 'Select',
+		'options': 'link:Grade',
+		'permlevel': 1,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 9,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Yes',
+		'doctype': 'DocField',
+		'fieldname': 'is_active',
+		'fieldtype': 'Select',
+		'idx': 10,
+		'in_filter': 1,
+		'label': 'Is Active',
+		'oldfieldname': 'is_active',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'from_date',
+		'fieldtype': 'Date',
+		'idx': 11,
+		'label': 'From Date',
+		'oldfieldname': 'from_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'to_date',
+		'fieldtype': 'Date',
+		'idx': 12,
+		'label': 'To Date',
+		'oldfieldname': 'to_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Cost to Company',
+		'doctype': 'DocField',
+		'fieldname': 'ctc',
+		'fieldtype': 'Currency',
+		'idx': 13,
+		'in_filter': 1,
+		'label': 'CTC',
+		'oldfieldname': 'ctc',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Select',
+		'idx': 14,
+		'in_filter': 1,
+		'label': 'Company',
+		'options': 'link:Company',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'description': 'You can create more earning and deduction type from Setup --> HR',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 15,
+		'label': 'Earning & Deduction',
+		'oldfieldname': 'earning_deduction',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'hidden': 0,
+		'idx': 16,
+		'label': 'Earning',
+		'oldfieldname': 'col_brk2',
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'earning_details',
+		'fieldtype': 'Table',
+		'hidden': 0,
+		'idx': 17,
+		'label': 'Earning1',
+		'oldfieldname': 'earning_details',
+		'oldfieldtype': 'Table',
+		'options': 'Earning Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'hidden': 0,
+		'idx': 18,
+		'label': 'Deduction',
+		'oldfieldname': 'col_brk3',
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'deduction_details',
+		'fieldtype': 'Table',
+		'hidden': 0,
+		'idx': 19,
+		'label': 'Deduction1',
+		'oldfieldname': 'deduction_details',
+		'oldfieldtype': 'Table',
+		'options': 'Deduction Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 20,
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 21,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'total_earning',
+		'fieldtype': 'Currency',
+		'idx': 22,
+		'label': 'Total Earning',
+		'oldfieldname': 'total_earning',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'total_deduction',
+		'fieldtype': 'Currency',
+		'idx': 23,
+		'label': 'Total Deduction',
+		'oldfieldname': 'total_deduction',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 24,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'net_pay',
+		'fieldtype': 'Currency',
+		'idx': 25,
+		'label': 'Net Pay',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/crm/search_criteria/itemwise_delivery_details/__init__.py b/hr/doctype/ss_deduction_detail/__init__.py
similarity index 100%
rename from crm/search_criteria/itemwise_delivery_details/__init__.py
rename to hr/doctype/ss_deduction_detail/__init__.py
diff --git a/hr/doctype/ss_deduction_detail/ss_deduction_detail.txt b/hr/doctype/ss_deduction_detail/ss_deduction_detail.txt
new file mode 100644
index 0000000000..e7602264dc
--- /dev/null
+++ b/hr/doctype/ss_deduction_detail/ss_deduction_detail.txt
@@ -0,0 +1,109 @@
+# DocType, SS Deduction Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:24',
+		'docstatus': 0,
+		'modified': '2011-02-12 18:24:31',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 9
+	},
+
+	# These values are common for all DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'SS Deduction Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'SS Deduction Detail',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocType, SS Deduction Detail
+	{
+		'doctype': 'DocType',
+		'name': 'SS Deduction Detail'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'd_type',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Type',
+		'oldfieldname': 'd_type',
+		'oldfieldtype': 'Data',
+		'options': 'Deduction Type',
+		'permlevel': 0,
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'd_amount',
+		'fieldtype': 'Currency',
+		'idx': 2,
+		'label': 'Amount',
+		'oldfieldname': 'd_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'd_modified_amount',
+		'fieldtype': 'Currency',
+		'idx': 3,
+		'label': 'Modified Amount',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'd_depends_on_lwp',
+		'fieldtype': 'Check',
+		'idx': 4,
+		'label': 'Depends on LWP',
+		'permlevel': 0,
+		'trigger': 'Client'
+	}
+]
\ No newline at end of file
diff --git a/crm/search_criteria/itemwise_sales_details/__init__.py b/hr/doctype/ss_earning_detail/__init__.py
similarity index 100%
rename from crm/search_criteria/itemwise_sales_details/__init__.py
rename to hr/doctype/ss_earning_detail/__init__.py
diff --git a/hr/doctype/ss_earning_detail/ss_earning_detail.txt b/hr/doctype/ss_earning_detail/ss_earning_detail.txt
new file mode 100644
index 0000000000..10931d17f9
--- /dev/null
+++ b/hr/doctype/ss_earning_detail/ss_earning_detail.txt
@@ -0,0 +1,110 @@
+# DocType, SS Earning Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:24',
+		'docstatus': 0,
+		'modified': '2011-02-12 18:24:20',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'HR',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 7
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'SS Earning Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'SS Earning Detail',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocType, SS Earning Detail
+	{
+		'doctype': 'DocType',
+		'name': 'SS Earning Detail'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'e_type',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Type',
+		'oldfieldname': 'e_type',
+		'oldfieldtype': 'Data',
+		'options': 'Earning Type',
+		'permlevel': 0,
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'e_amount',
+		'fieldtype': 'Currency',
+		'idx': 2,
+		'label': 'Amount',
+		'oldfieldname': 'e_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'e_modified_amount',
+		'fieldtype': 'Currency',
+		'idx': 3,
+		'label': 'Modified Amount',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'e_depends_on_lwp',
+		'fieldtype': 'Check',
+		'idx': 4,
+		'label': 'Depends on LWP',
+		'permlevel': 0,
+		'trigger': 'Client'
+	}
+]
\ No newline at end of file
diff --git a/crm/search_criteria/monthly_despatched_trend/__init__.py b/hr/page/__init__.py
similarity index 100%
rename from crm/search_criteria/monthly_despatched_trend/__init__.py
rename to hr/page/__init__.py
diff --git a/crm/search_criteria/periodic_sales_summary/__init__.py b/hr/search_criteria/__init__.py
similarity index 100%
rename from crm/search_criteria/periodic_sales_summary/__init__.py
rename to hr/search_criteria/__init__.py
diff --git a/crm/search_criteria/sales_agentwise_commission/__init__.py b/hr/search_criteria/employee_appraisals/__init__.py
similarity index 100%
rename from crm/search_criteria/sales_agentwise_commission/__init__.py
rename to hr/search_criteria/employee_appraisals/__init__.py
diff --git a/payroll/search_criteria/employee_appraisals/employee_appraisals.txt b/hr/search_criteria/employee_appraisals/employee_appraisals.txt
similarity index 100%
rename from payroll/search_criteria/employee_appraisals/employee_appraisals.txt
rename to hr/search_criteria/employee_appraisals/employee_appraisals.txt
diff --git a/crm/search_criteria/sales_order_pending_items1/__init__.py b/hr/search_criteria/employee_details/__init__.py
similarity index 100%
rename from crm/search_criteria/sales_order_pending_items1/__init__.py
rename to hr/search_criteria/employee_details/__init__.py
diff --git a/payroll/search_criteria/employee_details/employee_details.txt b/hr/search_criteria/employee_details/employee_details.txt
similarity index 100%
rename from payroll/search_criteria/employee_details/employee_details.txt
rename to hr/search_criteria/employee_details/employee_details.txt
diff --git a/crm/search_criteria/sales_orderwise_booking_&_delivery_summary/__init__.py b/hr/search_criteria/employee_in_company_experience/__init__.py
similarity index 100%
rename from crm/search_criteria/sales_orderwise_booking_&_delivery_summary/__init__.py
rename to hr/search_criteria/employee_in_company_experience/__init__.py
diff --git a/payroll/search_criteria/employee_in_company_experience/employee_in_company_experience.txt b/hr/search_criteria/employee_in_company_experience/employee_in_company_experience.txt
similarity index 100%
rename from payroll/search_criteria/employee_in_company_experience/employee_in_company_experience.txt
rename to hr/search_criteria/employee_in_company_experience/employee_in_company_experience.txt
diff --git a/crm/search_criteria/sales_orderwise_pending_amount_to_bill/__init__.py b/hr/search_criteria/employee_information/__init__.py
similarity index 100%
rename from crm/search_criteria/sales_orderwise_pending_amount_to_bill/__init__.py
rename to hr/search_criteria/employee_information/__init__.py
diff --git a/payroll/search_criteria/employee_information/employee_information.py b/hr/search_criteria/employee_information/employee_information.py
similarity index 100%
rename from payroll/search_criteria/employee_information/employee_information.py
rename to hr/search_criteria/employee_information/employee_information.py
diff --git a/payroll/search_criteria/employee_information/employee_information.txt b/hr/search_criteria/employee_information/employee_information.txt
similarity index 100%
rename from payroll/search_criteria/employee_information/employee_information.txt
rename to hr/search_criteria/employee_information/employee_information.txt
diff --git a/crm/search_criteria/sales_orderwise_pending_qty_to_deliver/__init__.py b/hr/search_criteria/employees_birthday/__init__.py
similarity index 100%
rename from crm/search_criteria/sales_orderwise_pending_qty_to_deliver/__init__.py
rename to hr/search_criteria/employees_birthday/__init__.py
diff --git a/payroll/search_criteria/employees_birthday/employees_birthday.txt b/hr/search_criteria/employees_birthday/employees_birthday.txt
similarity index 100%
rename from payroll/search_criteria/employees_birthday/employees_birthday.txt
rename to hr/search_criteria/employees_birthday/employees_birthday.txt
diff --git a/crm/search_criteria/sales_persons_target_variance_item_group_wise/__init__.py b/hr/search_criteria/employeewise_balance_leave_report/__init__.py
similarity index 100%
rename from crm/search_criteria/sales_persons_target_variance_item_group_wise/__init__.py
rename to hr/search_criteria/employeewise_balance_leave_report/__init__.py
diff --git a/payroll/search_criteria/employeewise_balance_leave_report/employeewise_balance_leave_report.js b/hr/search_criteria/employeewise_balance_leave_report/employeewise_balance_leave_report.js
similarity index 100%
rename from payroll/search_criteria/employeewise_balance_leave_report/employeewise_balance_leave_report.js
rename to hr/search_criteria/employeewise_balance_leave_report/employeewise_balance_leave_report.js
diff --git a/payroll/search_criteria/employeewise_balance_leave_report/employeewise_balance_leave_report.py b/hr/search_criteria/employeewise_balance_leave_report/employeewise_balance_leave_report.py
similarity index 100%
rename from payroll/search_criteria/employeewise_balance_leave_report/employeewise_balance_leave_report.py
rename to hr/search_criteria/employeewise_balance_leave_report/employeewise_balance_leave_report.py
diff --git a/payroll/search_criteria/employeewise_balance_leave_report/employeewise_balance_leave_report.txt b/hr/search_criteria/employeewise_balance_leave_report/employeewise_balance_leave_report.txt
similarity index 100%
rename from payroll/search_criteria/employeewise_balance_leave_report/employeewise_balance_leave_report.txt
rename to hr/search_criteria/employeewise_balance_leave_report/employeewise_balance_leave_report.txt
diff --git a/crm/search_criteria/sales_personwise_transaction_summary/__init__.py b/hr/search_criteria/employeewise_leave_transaction_details/__init__.py
old mode 100755
new mode 100644
similarity index 100%
rename from crm/search_criteria/sales_personwise_transaction_summary/__init__.py
rename to hr/search_criteria/employeewise_leave_transaction_details/__init__.py
diff --git a/payroll/search_criteria/employeewise_leave_transaction_details/employeewise_leave_transaction_details.txt b/hr/search_criteria/employeewise_leave_transaction_details/employeewise_leave_transaction_details.txt
similarity index 100%
rename from payroll/search_criteria/employeewise_leave_transaction_details/employeewise_leave_transaction_details.txt
rename to hr/search_criteria/employeewise_leave_transaction_details/employeewise_leave_transaction_details.txt
diff --git a/crm/search_criteria/so_pending_items_3/__init__.py b/hr/search_criteria/expense_vouchers/__init__.py
similarity index 100%
rename from crm/search_criteria/so_pending_items_3/__init__.py
rename to hr/search_criteria/expense_vouchers/__init__.py
diff --git a/payroll/search_criteria/expense_vouchers/expense_vouchers.txt b/hr/search_criteria/expense_vouchers/expense_vouchers.txt
similarity index 100%
rename from payroll/search_criteria/expense_vouchers/expense_vouchers.txt
rename to hr/search_criteria/expense_vouchers/expense_vouchers.txt
diff --git a/crm/search_criteria/target_variance_report/__init__.py b/hr/search_criteria/monthly_attendance_details/__init__.py
similarity index 100%
rename from crm/search_criteria/target_variance_report/__init__.py
rename to hr/search_criteria/monthly_attendance_details/__init__.py
diff --git a/payroll/search_criteria/monthly_attendance_details/monthly_attendance_details.js b/hr/search_criteria/monthly_attendance_details/monthly_attendance_details.js
similarity index 100%
rename from payroll/search_criteria/monthly_attendance_details/monthly_attendance_details.js
rename to hr/search_criteria/monthly_attendance_details/monthly_attendance_details.js
diff --git a/payroll/search_criteria/monthly_attendance_details/monthly_attendance_details.py b/hr/search_criteria/monthly_attendance_details/monthly_attendance_details.py
similarity index 100%
rename from payroll/search_criteria/monthly_attendance_details/monthly_attendance_details.py
rename to hr/search_criteria/monthly_attendance_details/monthly_attendance_details.py
diff --git a/payroll/search_criteria/monthly_attendance_details/monthly_attendance_details.sql b/hr/search_criteria/monthly_attendance_details/monthly_attendance_details.sql
similarity index 100%
rename from payroll/search_criteria/monthly_attendance_details/monthly_attendance_details.sql
rename to hr/search_criteria/monthly_attendance_details/monthly_attendance_details.sql
diff --git a/payroll/search_criteria/monthly_attendance_details/monthly_attendance_details.txt b/hr/search_criteria/monthly_attendance_details/monthly_attendance_details.txt
similarity index 100%
rename from payroll/search_criteria/monthly_attendance_details/monthly_attendance_details.txt
rename to hr/search_criteria/monthly_attendance_details/monthly_attendance_details.txt
diff --git a/crm/search_criteria/territories_target_variance_item_group_wise/__init__.py b/hr/search_criteria/monthly_salary_register/__init__.py
similarity index 100%
rename from crm/search_criteria/territories_target_variance_item_group_wise/__init__.py
rename to hr/search_criteria/monthly_salary_register/__init__.py
diff --git a/payroll/search_criteria/monthly_salary_register/monthly_salary_register.txt b/hr/search_criteria/monthly_salary_register/monthly_salary_register.txt
similarity index 100%
rename from payroll/search_criteria/monthly_salary_register/monthly_salary_register.txt
rename to hr/search_criteria/monthly_salary_register/monthly_salary_register.txt
diff --git a/crm/search_criteria/territory_item_group_wise_gp/__init__.py b/hr/search_criteria/new_or_left_employees_for_a_month/__init__.py
similarity index 100%
rename from crm/search_criteria/territory_item_group_wise_gp/__init__.py
rename to hr/search_criteria/new_or_left_employees_for_a_month/__init__.py
diff --git a/payroll/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.js b/hr/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.js
similarity index 100%
rename from payroll/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.js
rename to hr/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.js
diff --git a/payroll/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.py b/hr/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.py
similarity index 100%
rename from payroll/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.py
rename to hr/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.py
diff --git a/payroll/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.txt b/hr/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.txt
similarity index 100%
rename from payroll/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.txt
rename to hr/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.txt
diff --git a/crm/search_criteria/territory_sales___variance_report/__init__.py b/hr/search_criteria/pending_appraisals/__init__.py
similarity index 100%
rename from crm/search_criteria/territory_sales___variance_report/__init__.py
rename to hr/search_criteria/pending_appraisals/__init__.py
diff --git a/payroll/search_criteria/pending_appraisals/pending_appraisals.js b/hr/search_criteria/pending_appraisals/pending_appraisals.js
similarity index 100%
rename from payroll/search_criteria/pending_appraisals/pending_appraisals.js
rename to hr/search_criteria/pending_appraisals/pending_appraisals.js
diff --git a/payroll/search_criteria/pending_appraisals/pending_appraisals.txt b/hr/search_criteria/pending_appraisals/pending_appraisals.txt
similarity index 100%
rename from payroll/search_criteria/pending_appraisals/pending_appraisals.txt
rename to hr/search_criteria/pending_appraisals/pending_appraisals.txt
diff --git a/crm/search_criteria/total_target_variance_report/__init__.py b/hr/search_criteria/pending_expense_vouchers/__init__.py
similarity index 100%
rename from crm/search_criteria/total_target_variance_report/__init__.py
rename to hr/search_criteria/pending_expense_vouchers/__init__.py
diff --git a/payroll/search_criteria/pending_expense_vouchers/pending_expense_vouchers.js b/hr/search_criteria/pending_expense_vouchers/pending_expense_vouchers.js
similarity index 100%
rename from payroll/search_criteria/pending_expense_vouchers/pending_expense_vouchers.js
rename to hr/search_criteria/pending_expense_vouchers/pending_expense_vouchers.js
diff --git a/payroll/search_criteria/pending_expense_vouchers/pending_expense_vouchers.txt b/hr/search_criteria/pending_expense_vouchers/pending_expense_vouchers.txt
similarity index 100%
rename from payroll/search_criteria/pending_expense_vouchers/pending_expense_vouchers.txt
rename to hr/search_criteria/pending_expense_vouchers/pending_expense_vouchers.txt
diff --git a/crm/search_criteria/variance_report/__init__.py b/hr/search_criteria/salary_register/__init__.py
similarity index 100%
rename from crm/search_criteria/variance_report/__init__.py
rename to hr/search_criteria/salary_register/__init__.py
diff --git a/payroll/search_criteria/salary_register/salary_register.js b/hr/search_criteria/salary_register/salary_register.js
similarity index 100%
rename from payroll/search_criteria/salary_register/salary_register.js
rename to hr/search_criteria/salary_register/salary_register.js
diff --git a/payroll/search_criteria/salary_register/salary_register.py b/hr/search_criteria/salary_register/salary_register.py
similarity index 100%
rename from payroll/search_criteria/salary_register/salary_register.py
rename to hr/search_criteria/salary_register/salary_register.py
diff --git a/payroll/search_criteria/salary_register/salary_register.txt b/hr/search_criteria/salary_register/salary_register.txt
similarity index 100%
rename from payroll/search_criteria/salary_register/salary_register.txt
rename to hr/search_criteria/salary_register/salary_register.txt
diff --git a/maintenance/__init__.py b/hr/search_criteria/salary_slips/__init__.py
similarity index 100%
rename from maintenance/__init__.py
rename to hr/search_criteria/salary_slips/__init__.py
diff --git a/payroll/search_criteria/salary_slips/salary_slips.txt b/hr/search_criteria/salary_slips/salary_slips.txt
similarity index 100%
rename from payroll/search_criteria/salary_slips/salary_slips.txt
rename to hr/search_criteria/salary_slips/salary_slips.txt
diff --git a/maintenance/doctype/__init__.py b/hr/search_criteria/salary_structure_details/__init__.py
similarity index 100%
rename from maintenance/doctype/__init__.py
rename to hr/search_criteria/salary_structure_details/__init__.py
diff --git a/payroll/search_criteria/salary_structure_details/salary_structure_details.txt b/hr/search_criteria/salary_structure_details/salary_structure_details.txt
similarity index 100%
rename from payroll/search_criteria/salary_structure_details/salary_structure_details.txt
rename to hr/search_criteria/salary_structure_details/salary_structure_details.txt
diff --git a/knowledge_base/doctype/answer/answer.txt b/knowledge_base/doctype/answer/answer.txt
index 2702398bde..904e498e50 100644
--- a/knowledge_base/doctype/answer/answer.txt
+++ b/knowledge_base/doctype/answer/answer.txt
@@ -1,220 +1,109 @@
+# DocType, Answer
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2011-05-04 11:09:49',
+		'docstatus': 0,
+		'modified': '2011-05-30 15:52:52',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
 	{
-		'_last_update': None,
-		'_user_tags': None,
 		'allow_attach': 0,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
 		'allow_trash': 1,
 		'autoname': '_ANS.#######',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-09 11:04:37',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
 		'in_create': 1,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-04-26 14:56:57',
-		'modified_by': 'Administrator',
 		'module': 'Knowledge Base',
-		'name': 'Answer',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
+		'name': '__common__',
 		'read_only': 1,
-		'read_only_onload': None,
-		'search_fields': None,
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
 		'version': 3
 	},
+
+	# These values are common for all DocField
 	{
-		'amend': None,
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Answer',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'amend': 0,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2011-05-09 11:04:37',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 1,
-		'match': None,
-		'modified': '2011-05-09 11:04:37',
-		'modified_by': 'Administrator',
-		'name': '000000475',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'parent': 'Answer',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
 		'permlevel': 0,
 		'read': 1,
 		'role': 'All',
-		'submit': None,
+		'submit': 0,
 		'write': 1
 	},
+
+	# DocType, Answer
+	{
+		'doctype': 'DocType',
+		'name': 'Answer'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:04:37',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'question',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 1,
-		'in_filter': None,
 		'label': 'Question',
-		'modified': '2011-05-09 11:04:37',
-		'modified_by': 'Administrator',
-		'name': '000000476',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Question',
-		'owner': 'Administrator',
-		'parent': 'Answer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'Question'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:04:37',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'answer',
 		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
-		'in_filter': None,
 		'label': 'Answer',
-		'modified': '2011-05-09 11:04:37',
-		'modified_by': 'Administrator',
-		'name': '000000477',
-		'no_copy': None,
 		'oldfieldname': 'question',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Answer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'oldfieldtype': 'Text'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:04:37',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'points',
 		'fieldtype': 'Int',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
-		'in_filter': None,
-		'label': 'Points',
-		'modified': '2011-05-09 11:04:37',
-		'modified_by': 'Administrator',
-		'name': '000000478',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Answer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Points'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:04:37',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': '_users_voted',
 		'fieldtype': 'Text',
 		'hidden': 1,
-		'icon': None,
 		'idx': 4,
-		'in_filter': None,
 		'label': 'Users Voted',
-		'modified': '2011-05-09 11:04:37',
-		'modified_by': 'Administrator',
-		'name': '000000479',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Answer',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	}
 ]
\ No newline at end of file
diff --git a/knowledge_base/doctype/question/question.txt b/knowledge_base/doctype/question/question.txt
index 066b75babe..428d269fe9 100644
--- a/knowledge_base/doctype/question/question.txt
+++ b/knowledge_base/doctype/question/question.txt
@@ -1,395 +1,165 @@
+# DocType, Question
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'_user_tags': None,
-		'allow_attach': 0,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': 1,
-		'autoname': 'QUES.#######',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
 		'creation': '2010-08-08 17:09:17',
-		'description': None,
 		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': 1,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
 		'modified': '2011-04-20 18:22:44',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_attach': 0,
+		'allow_trash': 1,
+		'autoname': 'QUES.#######',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 1,
 		'module': 'Knowledge Base',
-		'name': 'Question',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
+		'name': '__common__',
 		'read_only': 1,
-		'read_only_onload': None,
-		'search_fields': None,
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
 		'version': 7
 	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Question',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
 	{
-		'amend': None,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2010-08-08 17:09:17',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 1,
-		'match': None,
-		'modified': '2010-08-08 17:09:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00433',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'parent': 'Question',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
 		'permlevel': 0,
 		'read': 1,
 		'role': 'All',
-		'submit': None,
 		'write': 1
 	},
+
+	# DocType, Question
+	{
+		'doctype': 'DocType',
+		'name': 'Question'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'question',
 		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 1,
-		'in_filter': None,
 		'label': 'Question',
-		'modified': '2011-05-09 11:04:36',
-		'modified_by': 'Administrator',
-		'name': 'FL02621',
-		'no_copy': None,
 		'oldfieldname': 'question',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Question',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'oldfieldtype': 'Text'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:04:36',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'points',
 		'fieldtype': 'Int',
 		'hidden': 1,
-		'icon': None,
 		'idx': 2,
-		'in_filter': None,
-		'label': 'Points',
-		'modified': '2011-05-09 11:04:36',
-		'modified_by': 'Administrator',
-		'name': '000000472',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Question',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Points'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'answer',
 		'fieldtype': 'Text Editor',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
-		'in_filter': None,
 		'label': 'Answer',
-		'modified': '2010-08-08 17:09:17',
-		'modified_by': 'Administrator',
-		'name': 'FL02622',
-		'no_copy': None,
 		'oldfieldname': 'answer',
-		'oldfieldtype': 'Text Editor',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Question',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'oldfieldtype': 'Text Editor'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:04:36',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': '_user_tags',
 		'fieldtype': 'Data',
 		'hidden': 1,
-		'icon': None,
 		'idx': 4,
-		'in_filter': None,
-		'label': 'User Tags',
-		'modified': '2011-05-09 11:04:36',
-		'modified_by': 'Administrator',
-		'name': '000000473',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Question',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'User Tags'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'tag_1',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 5,
-		'in_filter': None,
 		'label': 'Tag 1',
-		'modified': '2010-08-08 17:09:17',
-		'modified_by': 'Administrator',
-		'name': 'FL02623',
-		'no_copy': None,
 		'oldfieldname': 'tag_1',
 		'oldfieldtype': 'Link',
-		'options': 'Question Tag',
-		'owner': 'Administrator',
-		'parent': 'Question',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'Question Tag'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:04:36',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': '_users_voted',
 		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 6,
-		'in_filter': None,
-		'label': 'Users Voted',
-		'modified': '2011-05-09 11:04:36',
-		'modified_by': 'Administrator',
-		'name': '000000474',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Question',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Users Voted'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'tag_2',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 7,
-		'in_filter': None,
 		'label': 'Tag 2',
-		'modified': '2010-08-08 17:09:17',
-		'modified_by': 'Administrator',
-		'name': 'FL02624',
-		'no_copy': None,
 		'oldfieldname': 'tag_2',
 		'oldfieldtype': 'Link',
-		'options': 'Question Tag',
-		'owner': 'Administrator',
-		'parent': 'Question',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'Question Tag'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'tag_3',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 8,
-		'in_filter': None,
 		'label': 'Tag 3',
-		'modified': '2010-08-08 17:09:17',
-		'modified_by': 'Administrator',
-		'name': 'FL02625',
-		'no_copy': None,
 		'oldfieldname': 'tag_3',
 		'oldfieldtype': 'Link',
-		'options': 'Question Tag',
-		'owner': 'Administrator',
-		'parent': 'Question',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'Question Tag'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'file_list',
 		'fieldtype': 'Text',
 		'hidden': 1,
-		'icon': None,
 		'idx': 9,
-		'in_filter': None,
 		'label': 'File List',
-		'modified': '2010-08-08 17:09:17',
-		'modified_by': 'Administrator',
-		'name': 'FL02626',
-		'no_copy': None,
 		'oldfieldname': 'file_list',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Question',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'oldfieldtype': 'Text'
 	}
 ]
\ No newline at end of file
diff --git a/knowledge_base/page/question_view/question_view.txt b/knowledge_base/page/question_view/question_view.txt
index 0840e63ee5..9a10f8f930 100644
--- a/knowledge_base/page/question_view/question_view.txt
+++ b/knowledge_base/page/question_view/question_view.txt
@@ -1,26 +1,27 @@
+# Page, question-view
 [
+
+	# These values are common in all dictionaries
 	{
-		'content': None,
-		'creation': '2011-05-09 11:04:37',
+		'creation': '2011-05-04 11:09:50',
 		'docstatus': 0,
-		'doctype': 'Page',
-		'icon': None,
-		'idx': None,
-		'menu_index': None,
 		'modified': '2011-03-29 13:54:27',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
 		'module': 'Knowledge Base',
-		'name': 'Question View',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_name': 'Question View',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'script': None,
-		'show_in_menu': None,
-		'standard': 'Yes',
-		'static_content': None,
-		'style': None
+		'standard': 'Yes'
+	},
+
+	# Page, question-view
+	{
+		'doctype': 'Page',
+		'name': 'question-view'
 	}
 ]
\ No newline at end of file
diff --git a/knowledge_base/page/questions/questions.txt b/knowledge_base/page/questions/questions.txt
index 22cc3ed6bd..d71225a7a0 100644
--- a/knowledge_base/page/questions/questions.txt
+++ b/knowledge_base/page/questions/questions.txt
@@ -1,26 +1,27 @@
+# Page, questions
 [
+
+	# These values are common in all dictionaries
 	{
-		'content': None,
-		'creation': '2011-05-09 11:04:37',
+		'creation': '2011-05-04 11:09:49',
 		'docstatus': 0,
-		'doctype': 'Page',
-		'icon': None,
-		'idx': None,
-		'menu_index': None,
 		'modified': '2011-03-29 13:53:57',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
 		'module': 'Knowledge Base',
-		'name': 'Questions',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_name': 'Questions',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'script': None,
-		'show_in_menu': None,
-		'standard': 'Yes',
-		'static_content': None,
-		'style': None
+		'standard': 'Yes'
+	},
+
+	# Page, questions
+	{
+		'doctype': 'Page',
+		'name': 'questions'
 	}
 ]
\ No newline at end of file
diff --git a/maintenance/Module Def/Maintenance/Maintenance.txt b/maintenance/Module Def/Maintenance/Maintenance.txt
deleted file mode 100644
index 034f6a66a2..0000000000
--- a/maintenance/Module Def/Maintenance/Maintenance.txt	
+++ /dev/null
@@ -1,407 +0,0 @@
-[
-	{
-		'_last_update': '1300959286',
-		'creation': '2010-11-30 22:41:00',
-		'disabled': 'No',
-		'docstatus': 0,
-		'doctype': u'Module Def',
-		'doctype_list': None,
-		'file_list': None,
-		'idx': None,
-		'is_hidden': 'No',
-		'last_updated_date': '2010-11-29 12:02:02',
-		'modified': '2011-03-24 15:08:46',
-		'modified_by': 'Administrator',
-		'module_desc': '
Manage maintenance quotes, orders, schedule etc.
',
-		'module_icon': 'Maintenance.gif',
-		'module_label': 'Support',
-		'module_name': 'Maintenance',
-		'module_page': None,
-		'module_seq': 8,
-		'name': 'Maintenance',
-		'owner': 'nabin@webnotestech.com',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
-		'trash_reason': None,
-		'widget_code': None
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 12:00:50',
-		'description': None,
-		'display_name': None,
-		'doc_name': 'Forms',
-		'doc_type': 'Separator',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 1,
-		'modified': '2011-03-24 15:08:46',
-		'modified_by': 'Administrator',
-		'name': '000003015',
-		'owner': 'Administrator',
-		'parent': 'Maintenance',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 12:00:50',
-		'description': None,
-		'display_name': 'Warranty/AMC Summary',
-		'doc_name': 'Serial No',
-		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 2,
-		'modified': '2011-03-24 15:08:46',
-		'modified_by': 'Administrator',
-		'name': '000003022',
-		'owner': 'Administrator',
-		'parent': 'Maintenance',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 12:00:50',
-		'description': None,
-		'display_name': 'AMC Summary',
-		'doc_name': 'Serial No',
-		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 3,
-		'modified': '2011-03-24 15:08:46',
-		'modified_by': 'Administrator',
-		'name': '000003023',
-		'owner': 'Administrator',
-		'parent': 'Maintenance',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2010-11-30 22:41:00',
-		'description': 'A unique number identifying each entity of an item',
-		'display_name': 'Serial No',
-		'doc_name': 'Serial No',
-		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': 'item_code\nstatus\npr_no\ndelivery_note_no\ncustomer',
-		'hide': 0,
-		'icon': None,
-		'idx': 4,
-		'modified': '2011-03-24 15:08:46',
-		'modified_by': 'Administrator',
-		'name': 'MDI00137',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Maintenance',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2010-11-30 22:41:00',
-		'description': 'Create schedule based on maintenance order',
-		'display_name': 'Maintenance Schedule',
-		'doc_name': 'Maintenance Schedule',
-		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': 'status\ntransaction_date\ncustomer\nsales_order_no',
-		'hide': None,
-		'icon': None,
-		'idx': 5,
-		'modified': '2011-03-24 15:08:46',
-		'modified_by': 'Administrator',
-		'name': 'MDI00138',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Maintenance',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 12:00:50',
-		'description': "Database of Support Ticket's raised by Customers",
-		'display_name': 'Support Ticket',
-		'doc_name': 'Support Ticket',
-		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': 'status\nopening_date\ncustomer\nallocated_to',
-		'hide': None,
-		'icon': None,
-		'idx': 6,
-		'modified': '2011-03-24 15:08:46',
-		'modified_by': 'Administrator',
-		'name': '000003019',
-		'owner': 'Administrator',
-		'parent': 'Maintenance',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2010-11-30 22:41:00',
-		'description': 'Database of issues raised your Customers',
-		'display_name': 'Customer Issue',
-		'doc_name': 'Customer Issue',
-		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': 'status\ncomplaint_date\ncustomer\nallocated_to\nallocated_on',
-		'hide': None,
-		'icon': None,
-		'idx': 7,
-		'modified': '2011-03-24 15:08:46',
-		'modified_by': 'Administrator',
-		'name': 'MDI00139',
-		'owner': 'Administrator',
-		'parent': 'Maintenance',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 12:00:50',
-		'description': 'Create schedule based on maintenance order',
-		'display_name': 'Maintenance Schedule',
-		'doc_name': 'Maintenance Schedule',
-		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': 'status\ntransaction_date\ncustomer\nsales_order_no',
-		'hide': None,
-		'icon': None,
-		'idx': 8,
-		'modified': '2011-03-24 15:08:46',
-		'modified_by': 'Administrator',
-		'name': '000003017',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Maintenance',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2010-11-30 22:41:00',
-		'description': None,
-		'display_name': 'Maintenance Visit',
-		'doc_name': 'Maintenance Visit',
-		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': 'status\nmntc_date\ncustomer\nmaintenance_type\ncompletion_status',
-		'hide': None,
-		'icon': None,
-		'idx': 9,
-		'modified': '2011-03-24 15:08:46',
-		'modified_by': 'Administrator',
-		'name': 'MDI00140',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Maintenance',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 12:00:50',
-		'description': 'Database of issues raised your Customers',
-		'display_name': 'Customer Issue',
-		'doc_name': 'Customer Issue',
-		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': 'status\ncomplaint_date\ncustomer\nallocated_to\nallocated_on',
-		'hide': None,
-		'icon': None,
-		'idx': 10,
-		'modified': '2011-03-24 15:08:46',
-		'modified_by': 'Administrator',
-		'name': '000003016',
-		'owner': 'Administrator',
-		'parent': 'Maintenance',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 12:00:50',
-		'description': None,
-		'display_name': 'Maintenance Visit',
-		'doc_name': 'Maintenance Visit',
-		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': 'status\nmntc_date\ncustomer\nmaintenance_type\ncompletion_status',
-		'hide': None,
-		'icon': None,
-		'idx': 11,
-		'modified': '2011-03-24 15:08:46',
-		'modified_by': 'Administrator',
-		'name': '000003018',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Maintenance',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 12:00:50',
-		'description': None,
-		'display_name': None,
-		'doc_name': 'Reports',
-		'doc_type': 'Separator',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 12,
-		'modified': '2011-03-24 15:08:46',
-		'modified_by': 'Administrator',
-		'name': '000003020',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Maintenance',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 12:00:50',
-		'description': 'List of all scheduled mainteance. You can filter by sales person, date, serial no etc. ',
-		'display_name': 'Maintenance Schedule Details',
-		'doc_name': 'Maintenance Schedule Detail',
-		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 13,
-		'modified': '2011-03-24 15:08:46',
-		'modified_by': 'Administrator',
-		'name': '000003024',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Maintenance',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 12:00:50',
-		'description': 'List of all issues raised by customer',
-		'display_name': 'Customer Issues',
-		'doc_name': 'Customer Issue',
-		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 14,
-		'modified': '2011-03-24 15:08:46',
-		'modified_by': 'Administrator',
-		'name': '000003025',
-		'owner': 'Administrator',
-		'parent': 'Maintenance',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 12:00:50',
-		'description': None,
-		'display_name': 'Warranty/AMC Summary',
-		'doc_name': 'Serial No',
-		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 15,
-		'modified': '2011-03-24 15:08:46',
-		'modified_by': 'Administrator',
-		'name': '000003021',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Maintenance',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 12:00:50',
-		'description': None,
-		'display_name': 'Maintenance Orderwise Pending Amount To Bill',
-		'doc_name': 'Sales Order Detail',
-		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 16,
-		'modified': '2011-03-24 15:08:46',
-		'modified_by': 'Administrator',
-		'name': '000003026',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'creation': '2010-11-30 22:41:00',
-		'docstatus': 0,
-		'doctype': 'Module Def Role',
-		'idx': 1,
-		'modified': '2011-03-24 15:08:46',
-		'modified_by': 'Administrator',
-		'name': 'MDR00031',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Maintenance',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
-		'role': 'Administrator'
-	},
-	{
-		'creation': '2010-11-30 22:41:00',
-		'docstatus': 0,
-		'doctype': 'Module Def Role',
-		'idx': 2,
-		'modified': '2011-03-24 15:08:46',
-		'modified_by': 'Administrator',
-		'name': 'MDR00032',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Maintenance',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
-		'role': 'Maintenance User'
-	},
-	{
-		'creation': '2010-11-30 22:41:00',
-		'docstatus': 0,
-		'doctype': 'Module Def Role',
-		'idx': 3,
-		'modified': '2011-03-24 15:08:46',
-		'modified_by': 'Administrator',
-		'name': 'MDR00033',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Maintenance',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
-		'role': 'Maintenance Manager'
-	}
-]
\ No newline at end of file
diff --git a/maintenance/doctype/customer_issue/customer_issue.txt b/maintenance/doctype/customer_issue/customer_issue.txt
deleted file mode 100644
index 9fd47bfe25..0000000000
--- a/maintenance/doctype/customer_issue/customer_issue.txt
+++ /dev/null
@@ -1,1696 +0,0 @@
-[
-	{
-		'_last_update': '1306307676',
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:57',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'module': 'Maintenance',
-		'name': 'Customer Issue',
-		'name_case': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'status,customer,customer_name,allocated_to,allocated_on, territory',
-		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': '%(complaint)s By %(complaint_raised_by)s on %(issue_date)s',
-		'tag_fields': 'status',
-		'use_template': None,
-		'version': 96
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-10-07 12:49:37',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'PERM00694',
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Guest',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:08:57',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'PERM00162',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:08:57',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'PERM00163',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:08:57',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'PERM00164',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Maintenance Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:08:57',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'PERM00165',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Maintenance Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:08:57',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'PERM00166',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Maintenance User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:08:57',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 7,
-		'match': None,
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'PERM00167',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Maintenance User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-18 13:55:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Customer Issue',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': '000000319',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-24 17:12:37',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'naming_series',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': 0,
-		'label': 'Series',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL04128',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'naming_series',
-		'oldfieldtype': 'Select',
-		'options': '\nCI/2010-2011/',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:57',
-		'default': 'Open',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 1,
-		'label': 'Status',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL00866',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Select',
-		'options': '\nOpen\nClosed\nWork In Progress\nCancelled',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': 'Today',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'complaint_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Issue Date',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL00867',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'complaint_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'complaint_raised_by',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Raised By',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL00869',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'complaint_raised_by',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-10-06 17:24:38',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'from_company',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'From Company',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL03954',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'from_company',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'service_address',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Service Address',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL00870',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'service_address',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-18 13:55:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': '000000320',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:47:53',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': 1,
-		'label': 'Customer',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL03779',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer',
-		'oldfieldtype': 'Link',
-		'options': 'Customer',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-18 12:06:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_address',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Customer Address',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': '000001053',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Address',
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-18 12:06:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_person',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Contact Person',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': '000001054',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Contact',
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-18 12:06:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Name',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': '000001055',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-18 12:06:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'address_display',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Address',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': '000001056',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-18 12:06:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_display',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Contact',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': '000001057',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-18 12:06:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_mobile',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Mobile No',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': '000001058',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-18 12:06:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_email',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': 'Contact Email',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': '000001059',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'territory',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': 1,
-		'label': 'Territory',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL00875',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'territory',
-		'oldfieldtype': 'Link',
-		'options': 'Territory',
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-18 11:46:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_group',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Customer Group',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': '000001052',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Customer Group',
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL00876',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL00868',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
-		'label': 'Amended From',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL00877',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'hidden': 1,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
-		'label': 'Amendment Date',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL00878',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-18 13:55:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': None,
-		'label': 'Issue Details',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': '000000321',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-18 13:55:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'serial_no',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 24,
-		'in_filter': None,
-		'label': 'Serial No',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': '000000313',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Serial No',
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_code',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 25,
-		'in_filter': 1,
-		'label': 'Item Code',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL00880',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'item_code',
-		'oldfieldtype': 'Link',
-		'options': 'Item',
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': 'eval:doc.item_code',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 26,
-		'in_filter': None,
-		'label': 'Item Name',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL00881',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'item_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': 'eval:doc.item_code',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 27,
-		'in_filter': None,
-		'label': 'Description',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL00882',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'description',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '300px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'complaint',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 28,
-		'in_filter': None,
-		'label': 'Issue',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL00883',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'complaint',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-18 13:55:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 29,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': '000000322',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-04-18 13:55:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'warranty_amc_status',
-		'fieldtype': 'Select',
-		'hidden': 0,
-		'icon': None,
-		'idx': 30,
-		'in_filter': 1,
-		'label': 'Warranty / AMC Status',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': '000000315',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': '\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC',
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-18 13:55:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'warranty_expiry_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 31,
-		'in_filter': None,
-		'label': 'Warranty Expiry Date',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': '000000316',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-18 13:55:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amc_expiry_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 32,
-		'in_filter': None,
-		'label': 'AMC Expiry Date',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': '000000317',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'allocated_on',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 33,
-		'in_filter': 1,
-		'label': 'Allocated On',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL00885',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'allocated_on',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'allocated_to',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 34,
-		'in_filter': 1,
-		'label': 'Allocated To',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL00886',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'allocated_to',
-		'oldfieldtype': 'Link',
-		'options': 'Sales Person',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-18 13:55:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 35,
-		'in_filter': None,
-		'label': 'Resolution Detail',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': '000000323',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'resolution_details',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 36,
-		'in_filter': None,
-		'label': 'Resolution Details',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL00888',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'resolution_details',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-18 13:55:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 37,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': '000000324',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'resolution_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 38,
-		'in_filter': 1,
-		'label': 'Resolution Date',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL00890',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'resolution_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'resolved_by',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 39,
-		'in_filter': 1,
-		'label': 'Resolved By',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL00891',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'resolved_by',
-		'oldfieldtype': 'Link',
-		'options': 'Sales Person',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 0,
-		'colour': 'White:FFF',
-		'creation': '2011-04-18 13:55:57',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 40,
-		'in_filter': None,
-		'label': 'Next Steps',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': '000000325',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 41,
-		'in_filter': None,
-		'label': 'Make Maintenance Visit',
-		'modified': '2011-05-27 18:30:14',
-		'modified_by': 'Administrator',
-		'name': 'FL00893',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Customer Issue',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/maintenance/doctype/item_maintenance_detail/item_maintenance_detail.txt b/maintenance/doctype/item_maintenance_detail/item_maintenance_detail.txt
deleted file mode 100644
index e2521c398d..0000000000
--- a/maintenance/doctype/item_maintenance_detail/item_maintenance_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-12-08 15:46:00', 'search_fields': None, 'module': 'Maintenance', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 8, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'IMD.#####', 'client_script_core': '', 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Item Maintenance Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': '', 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-12-08 15:46:00', 'doctype': 'DocField', 'oldfieldname': 'item_code', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Item Code', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Item Maintenance Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01975', 'idx': 1, 'default': None, 'colour': 'White:FFF', 'modified': '2010-12-08 15:46:00', 'parenttype': 'DocType', 'fieldname': 'item_code', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-12-08 15:46:00', 'doctype': 'DocField', 'oldfieldname': 'item_name', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Item Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Item Maintenance Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01976', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:00', 'parenttype': 'DocType', 'fieldname': 'item_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-12-08 15:46:00', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Item Maintenance Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01977', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:00', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-12-08 15:46:00', 'doctype': 'DocField', 'oldfieldname': 'start_date', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Start Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Item Maintenance Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01978', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:00', 'parenttype': 'DocType', 'fieldname': 'start_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-12-08 15:46:00', 'doctype': 'DocField', 'oldfieldname': 'end_date', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'End Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Item Maintenance Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01979', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:00', 'parenttype': 'DocType', 'fieldname': 'end_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-12-08 15:46:00', 'doctype': 'DocField', 'oldfieldname': 'periodicity', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Periodicity', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Item Maintenance Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01980', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:00', 'parenttype': 'DocType', 'fieldname': 'periodicity', 'fieldtype': 'Select', 'options': '\nWeekly\nMonthly\nQuarterly\nHalf Yearly\nYearly\nRandom', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Int', 'creation': '2010-12-08 15:46:00', 'doctype': 'DocField', 'oldfieldname': 'no_of_visits', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'No of Visits', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Item Maintenance Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01981', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:00', 'parenttype': 'DocType', 'fieldname': 'no_of_visits', 'fieldtype': 'Int', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-12-08 15:46:00', 'doctype': 'DocField', 'oldfieldname': 'incharge_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Incharge Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Item Maintenance Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01982', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:00', 'parenttype': 'DocType', 'fieldname': 'incharge_name', 'fieldtype': 'Link', 'options': 'Sales Person', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-12-08 15:46:00', 'doctype': 'DocField', 'oldfieldname': 'serial_no', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Serial No', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Item Maintenance Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01983', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:00', 'parenttype': 'DocType', 'fieldname': 'serial_no', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2010-12-08 15:46:00', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_docname', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Against Docname', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Item Maintenance Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01984', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:00', 'parenttype': 'DocType', 'fieldname': 'prevdoc_docname', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/maintenance/doctype/maintenance_schedule/maintenance_schedule.txt b/maintenance/doctype/maintenance_schedule/maintenance_schedule.txt
deleted file mode 100644
index 4840d5796e..0000000000
--- a/maintenance/doctype/maintenance_schedule/maintenance_schedule.txt
+++ /dev/null
@@ -1,1051 +0,0 @@
-[
-	{
-		'_last_update': '1305632624',
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'MS.#####',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:09',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-17 17:13:43',
-		'modified_by': 'Guest',
-		'module': 'Maintenance',
-		'name': 'Maintenance Schedule',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'status,customer,customer_name, sales_order_no',
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
-		'version': 155
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:09',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2010-08-08 17:09:09',
-		'modified_by': 'Administrator',
-		'name': 'PERM00338',
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:09',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2010-08-08 17:09:09',
-		'modified_by': 'Administrator',
-		'name': 'PERM00339',
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:09',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2010-08-08 17:09:09',
-		'modified_by': 'Administrator',
-		'name': 'PERM00340',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Maintenance Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:09',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2010-08-08 17:09:09',
-		'modified_by': 'Administrator',
-		'name': 'PERM00341',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Maintenance Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:53',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Customer Details',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL05207',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:53',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL05208',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 1,
-		'label': 'Customer',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL03793',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer',
-		'oldfieldtype': 'Link',
-		'options': 'Customer',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:53',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_address',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Customer Address',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL05200',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Address',
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_person',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Contact Person',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL01900',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': 1,
-		'label': 'Name',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL01898',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:53',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'address_display',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Address',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL05201',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:53',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_display',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Contact',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL05202',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:53',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_mobile',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Mobile No',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL05203',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:53',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_email',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Contact Email',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL05204',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:53',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL05209',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'transaction_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': 1,
-		'label': 'Transaction Date',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL01905',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'transaction_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:09',
-		'default': 'Draft',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': 1,
-		'label': 'Status',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL01904',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Select',
-		'options': '\nDraft\nSubmitted\nCancelled',
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Amended From',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL01906',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'hidden': 1,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Amendment Date',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL01907',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL01902',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'territory',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': 1,
-		'label': 'Territory',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL01901',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'territory',
-		'oldfieldtype': 'Link',
-		'options': 'Territory',
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:53',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_group',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Customer Group',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL05206',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Customer Group',
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:53',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Items',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL05210',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'sales_order_no',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': 1,
-		'label': 'Sales Order No',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL01908',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'sales_order_no',
-		'oldfieldtype': 'Link',
-		'options': 'Sales Order',
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
-		'label': 'Get Items',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL01909',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'pull_sales_order_detail',
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_maintenance_detail',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
-		'label': 'Item Maintenance Detail',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL01911',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'item_maintenance_detail',
-		'oldfieldtype': 'Table',
-		'options': 'Item Maintenance Detail',
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:53',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': None,
-		'label': 'Schedule',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL05211',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 24,
-		'in_filter': None,
-		'label': 'Generate Schedule',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL01912',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'maintenance_schedule_detail',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 25,
-		'in_filter': None,
-		'label': 'Maintenance Schedule Detail',
-		'modified': '2011-05-25 12:44:53',
-		'modified_by': 'Guest',
-		'name': 'FL01914',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'maintenance_schedule_detail',
-		'oldfieldtype': 'Table',
-		'options': 'Maintenance Schedule Detail',
-		'owner': 'Administrator',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt b/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
deleted file mode 100644
index 1825dfbc37..0000000000
--- a/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-12-08 15:46:00', 'search_fields': '', 'module': 'Maintenance', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 12, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'MSD.#####', 'client_script_core': '', 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Maintenance Schedule Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': '', 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-12-08 15:46:00', 'doctype': 'DocField', 'oldfieldname': 'item_code', 'owner': 'Administrator', 'reqd': 0, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Item Code', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Maintenance Schedule Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01985', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:00', 'parenttype': 'DocType', 'fieldname': 'item_code', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-12-08 15:46:00', 'doctype': 'DocField', 'oldfieldname': 'item_name', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': 0, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Item Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Maintenance Schedule Detail', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL01986', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:00', 'parenttype': 'DocType', 'fieldname': 'item_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-12-08 15:46:00', 'doctype': 'DocField', 'oldfieldname': 'scheduled_date', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Scheduled Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Maintenance Schedule Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01987', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:00', 'parenttype': 'DocType', 'fieldname': 'scheduled_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Date', 'creation': '2010-12-08 15:46:00', 'doctype': 'DocField', 'oldfieldname': 'actual_date', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Actual Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Maintenance Schedule Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01988', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:00', 'parenttype': 'DocType', 'fieldname': 'actual_date', 'fieldtype': 'Date', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-12-08 15:46:00', 'doctype': 'DocField', 'oldfieldname': 'incharge_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Incharge Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Maintenance Schedule Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01989', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:00', 'parenttype': 'DocType', 'fieldname': 'incharge_name', 'fieldtype': 'Link', 'options': 'Sales Person', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 0, 'oldfieldtype': 'Small Text', 'creation': '2010-12-08 15:46:00', 'doctype': 'DocField', 'oldfieldname': 'serial_no', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Serial No', 'width': '160px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Maintenance Schedule Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01990', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:00', 'parenttype': 'DocType', 'fieldname': 'serial_no', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/maintenance/doctype/maintenance_visit/maintenance_visit.txt b/maintenance/doctype/maintenance_visit/maintenance_visit.txt
deleted file mode 100644
index f8fa11b049..0000000000
--- a/maintenance/doctype/maintenance_visit/maintenance_visit.txt
+++ /dev/null
@@ -1,1313 +0,0 @@
-[
-	{
-		'_last_update': '1305704021',
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'MV.#####',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:09',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-18 13:03:39',
-		'modified_by': 'Guest',
-		'module': 'Maintenance',
-		'name': 'Maintenance Visit',
-		'name_case': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'status,maintenance_type,customer,customer_name, address,mntc_date,company,fiscal_year',
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': 'To %(customer_name)s on %(mntc_date)s',
-		'tag_fields': 'completion_status,maintenance_type',
-		'use_template': None,
-		'version': 94
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:09',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2010-08-08 17:09:09',
-		'modified_by': 'Administrator',
-		'name': 'PERM00342',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:09',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2010-08-08 17:09:09',
-		'modified_by': 'Administrator',
-		'name': 'PERM00343',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:09',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2010-08-08 17:09:09',
-		'modified_by': 'Administrator',
-		'name': 'PERM00344',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Maintenance Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:09',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2010-08-08 17:09:09',
-		'modified_by': 'Administrator',
-		'name': 'PERM00345',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Maintenance Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:09',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2010-08-08 17:09:09',
-		'modified_by': 'Administrator',
-		'name': 'PERM00346',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Maintenance User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:09',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2010-08-08 17:09:09',
-		'modified_by': 'Administrator',
-		'name': 'PERM00347',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Maintenance User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Customer Details',
-		'modified': '2011-05-25 12:44:56',
-		'modified_by': 'Guest',
-		'name': 'FL05223',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:56',
-		'modified_by': 'Guest',
-		'name': 'FL05224',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 1,
-		'label': 'Customer',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL03795',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer',
-		'oldfieldtype': 'Link',
-		'options': 'Customer',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_address',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Customer Address',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL05213',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Address',
-		'owner': 'Administrator',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_person',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Contact Person',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL01933',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Name',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL01931',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'address_display',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Address',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL05214',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_display',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Contact',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL05215',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_mobile',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Mobile No',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL05216',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_email',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Contact Email',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL05217',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL01926',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Select',
-		'options': 'link:Company',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL01927',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:56',
-		'modified_by': 'Guest',
-		'name': 'FL05225',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': 'Today',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'mntc_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Maintenance Date',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL01924',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'mntc_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'mntc_time',
-		'fieldtype': 'Time',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Maintenance Time',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL01925',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'mntc_time',
-		'oldfieldtype': 'Time',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:09',
-		'default': 'Draft',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': 'Status',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL01923',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Data',
-		'options': '\nDraft\nCancelled\nSubmitted',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Amended From',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL01928',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Amendment Date',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL01929',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'territory',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Territory',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL01934',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Territory',
-		'owner': 'Administrator',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_group',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'Customer Group',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL05219',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Customer Group',
-		'owner': 'Administrator',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
-		'label': 'Maintenance Details',
-		'modified': '2011-05-25 12:44:56',
-		'modified_by': 'Guest',
-		'name': 'FL05226',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'completion_status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
-		'label': 'Completion Status',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL01936',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'completion_status',
-		'oldfieldtype': 'Select',
-		'options': '\nPartially Completed\nFully Completed',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:09',
-		'default': 'Unscheduled',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'maintenance_type',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': 1,
-		'label': 'Maintenance Type',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL01937',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'maintenance_type',
-		'oldfieldtype': 'Select',
-		'options': '\nScheduled\nUnscheduled\nBreakdown',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 24,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:56',
-		'modified_by': 'Guest',
-		'name': 'FL05227',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'sales_order_no',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 25,
-		'in_filter': 1,
-		'label': 'Sales Order No',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL01939',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'sales_order_no',
-		'oldfieldtype': 'Link',
-		'options': 'Sales Order',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_issue_no',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 26,
-		'in_filter': 1,
-		'label': 'Customer Issue No',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL01940',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer_issue_no',
-		'oldfieldtype': 'Link',
-		'options': 'Customer Issue',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 27,
-		'in_filter': None,
-		'label': 'Get Items',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL01941',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'fetch_items',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 28,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:56',
-		'modified_by': 'Guest',
-		'name': 'FL05228',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'maintenance_visit_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 29,
-		'in_filter': None,
-		'label': 'Maintenance Visit Detail',
-		'modified': '2011-05-25 12:44:55',
-		'modified_by': 'Guest',
-		'name': 'FL01943',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'maintenance_visit_details',
-		'oldfieldtype': 'Table',
-		'options': 'Maintenance Visit Detail',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 30,
-		'in_filter': None,
-		'label': 'Feedback',
-		'modified': '2011-05-25 12:44:56',
-		'modified_by': 'Guest',
-		'name': 'FL05229',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_feedback',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 31,
-		'in_filter': None,
-		'label': 'Customer Feedback',
-		'modified': '2011-05-25 12:44:56',
-		'modified_by': 'Guest',
-		'name': 'FL01945',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer_feedback',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/maintenance/doctype/maintenance_visit_detail/maintenance_visit_detail.txt b/maintenance/doctype/maintenance_visit_detail/maintenance_visit_detail.txt
deleted file mode 100644
index f433c67ae5..0000000000
--- a/maintenance/doctype/maintenance_visit_detail/maintenance_visit_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-12-08 15:45:57', 'search_fields': None, 'module': 'Maintenance', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'ashwini@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 13, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'MVD.#####', 'client_script_core': '', 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Maintenance Visit Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': '', 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-12-08 15:45:57', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'ashwini@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Maintenance Visit Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01885', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-12-08 15:45:57', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-12-08 15:45:57', 'doctype': 'DocField', 'oldfieldname': 'service_person', 'owner': 'ashwini@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Service Person', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Maintenance Visit Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01886', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-12-08 15:45:57', 'parenttype': 'DocType', 'fieldname': 'service_person', 'fieldtype': 'Link', 'options': 'Sales Person', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-12-08 15:45:57', 'doctype': 'DocField', 'oldfieldname': 'work_done', 'owner': 'ashwini@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Work Done', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Maintenance Visit Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01887', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-12-08 15:45:57', 'parenttype': 'DocType', 'fieldname': 'work_done', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-12-08 15:45:57', 'doctype': 'DocField', 'oldfieldname': 'item_code', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Item Code', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Maintenance Visit Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01888', 'idx': 4, 'default': None, 'colour': 'White:FFF', 'modified': '2010-12-08 15:45:57', 'parenttype': 'DocType', 'fieldname': 'item_code', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-12-08 15:45:57', 'doctype': 'DocField', 'oldfieldname': 'item_name', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Item Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Maintenance Visit Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01889', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-12-08 15:45:57', 'parenttype': 'DocType', 'fieldname': 'item_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-12-08 15:45:57', 'doctype': 'DocField', 'oldfieldname': 'serial_no', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Serial No', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Maintenance Visit Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01890', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-12-08 15:45:57', 'parenttype': 'DocType', 'fieldname': 'serial_no', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2010-12-08 15:45:57', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_docname', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Against Document No', 'width': '160px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 1, 'description': None, 'parent': 'Maintenance Visit Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01891', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-12-08 15:45:57', 'parenttype': 'DocType', 'fieldname': 'prevdoc_docname', 'fieldtype': 'Data', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2010-12-08 15:45:57', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_detail_docname', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Against Document Detail No', 'width': '160px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Maintenance Visit Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01892', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-12-08 15:45:57', 'parenttype': 'DocType', 'fieldname': 'prevdoc_detail_docname', 'fieldtype': 'Data', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2010-12-08 15:45:57', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_doctype', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Document Type', 'width': '150px', 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 1, 'description': None, 'parent': 'Maintenance Visit Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01893', 'idx': 9, 'default': None, 'colour': 'White:FFF', 'modified': '2010-12-08 15:45:57', 'parenttype': 'DocType', 'fieldname': 'prevdoc_doctype', 'fieldtype': 'Data', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/maintenance/doctype/support_ticket/support_ticket.txt b/maintenance/doctype/support_ticket/support_ticket.txt
deleted file mode 100644
index 267dade230..0000000000
--- a/maintenance/doctype/support_ticket/support_ticket.txt
+++ /dev/null
@@ -1,1037 +0,0 @@
-[
-	{
-		'_last_update': '1308914721',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': 1,
-		'autoname': 'SUP.######',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-23 10:18:58',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'module': 'Maintenance',
-		'name': 'Support Ticket',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'status,customer,allocated_to,subject,raised_by',
-		'section_style': 'Tray',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': '%(subject)s',
-		'tag_fields': 'status,allocated_to',
-		'use_template': None,
-		'version': 143
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 1,
-		'creation': '2011-05-23 10:18:58',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'PERM00823',
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Guest',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2011-05-23 10:18:58',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': 'customer',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'PERM00824',
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Customer',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-05-23 10:18:58',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'PERM00825',
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Support Team',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2011-05-23 10:18:58',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': 'allocated_to',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'PERM00826',
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Support Team',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2011-05-23 10:18:58',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'PERM00827',
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'read': 1,
-		'role': 'Support Team',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-23 10:18:58',
-		'default': 'Open',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': 0,
-		'label': 'Status',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04803',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Select',
-		'options': '\nOpen\nTo Reply\nWaiting for Customer\nHold\nClosed',
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-23 10:18:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'subject',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': 1,
-		'label': 'Subject',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04804',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-23 10:18:58',
-		'default': None,
-		'depends_on': 'eval:doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'raised_by',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 1,
-		'label': 'Raised By (Email)',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04805',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'raised_by',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-23 10:18:58',
-		'default': None,
-		'depends_on': 'eval:doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Description',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04806',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'problem_description',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-27 13:07:26',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'problem_description',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Problem Description',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL05248',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'problem_description',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-24 11:54:03',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Thread HTML',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL05356',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-23 10:18:58',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'new_response',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'New Response',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04808',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-23 10:18:58',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Send',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04809',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'send_response',
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-24 11:54:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Additional Info',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL05357',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-24 11:54:03',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL05358',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-23 10:18:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': 1,
-		'label': 'Customer',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04812',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer',
-		'oldfieldtype': 'Link',
-		'options': 'Customer',
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-23 10:18:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': 1,
-		'label': 'Customer Name',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04813',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-24 12:20:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'address_display',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Address',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL05399',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-24 12:20:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_display',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Contact Name',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL05401',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-24 12:20:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_mobile',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Mobile No',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL05400',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-23 10:18:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_email',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': 'Contact Email',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04814',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'contact_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-23 10:18:58',
-		'default': 'Today',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'opening_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Opening Date',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04815',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'opening_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-23 10:18:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'opening_time',
-		'fieldtype': 'Time',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Opening Time',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04816',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'opening_time',
-		'oldfieldtype': 'Time',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-24 11:54:03',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL05359',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-23 10:18:58',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'allocated_to',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': 1,
-		'label': 'Allocated To',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04818',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'allocated_to',
-		'oldfieldtype': 'Link',
-		'options': 'Profile',
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-23 10:18:58',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'resolution_details',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
-		'label': 'Resolution Details',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04819',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'resolution_details',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-23 10:18:58',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'resolution_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': 0,
-		'label': 'Resolution Date',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04820',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'resolution_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-23 10:18:58',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'resolution_time',
-		'fieldtype': 'Time',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': None,
-		'label': 'Resolution Time',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL04821',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'resolution_time',
-		'oldfieldtype': 'Time',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-27 13:07:26',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'content_type',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 24,
-		'in_filter': None,
-		'label': 'Content Type',
-		'modified': '2011-06-27 11:30:33',
-		'modified_by': 'Administrator',
-		'name': 'FL05251',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/maintenance/doctype/support_ticket_response/support_ticket_response.txt b/maintenance/doctype/support_ticket_response/support_ticket_response.txt
deleted file mode 100644
index 70567f7166..0000000000
--- a/maintenance/doctype/support_ticket_response/support_ticket_response.txt
+++ /dev/null
@@ -1,167 +0,0 @@
-[
-	{
-		'_last_update': None,
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:44:27',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': 1,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-24 10:17:30',
-		'modified_by': 'Guest',
-		'module': 'Maintenance',
-		'name': 'Support Ticket Response',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': None,
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
-		'version': 4
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:27',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'mail',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Mail',
-		'modified': '2011-05-25 12:44:27',
-		'modified_by': 'Guest',
-		'name': 'FL05056',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket Response',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:27',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'from_email',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'From Email',
-		'modified': '2011-05-25 12:44:27',
-		'modified_by': 'Guest',
-		'name': 'FL05057',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket Response',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:27',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'content_type',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Content Type',
-		'modified': '2011-05-25 12:44:27',
-		'modified_by': 'Guest',
-		'name': 'FL05058',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Ticket Response',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/maintenance/search_criteria/customer_issues1/customer_issues1.txt b/maintenance/search_criteria/customer_issues1/customer_issues1.txt
deleted file mode 100644
index 265006b0bd..0000000000
--- a/maintenance/search_criteria/customer_issues1/customer_issues1.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Customer Issue\x01ID,Customer Issue\x01Status,Customer Issue\x01Complaint Date,Customer Issue\x01Complaint,Customer Issue\x01Item Code,Customer Issue\x01Item Name,Customer Issue\x01Allocated To,Customer Issue\x01Allocated On,Customer Issue\x01Resolved By,Customer Issue\x01Resolution Date,Customer Issue\x01Customer Name,Customer Issue\x01Fiscal Year',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Customer Issues1',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Customer Issue',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Customer Issue\x01Saved':1,'Customer Issue\x01Submitted':1,'Customer Issue\x01Status':'','Customer Issue\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2011-05-09 11:22:31',
-		'modified_by': 'Administrator',
-		'module': 'Maintenance',
-		'name': 'customer_issues1',
-		'owner': 'Administrator',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
-		'sort_by': '`tabCustomer Issue`.`name`',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/maintenance/search_criteria/warranty_amc_summary1/warranty_amc_summary1.txt b/maintenance/search_criteria/warranty_amc_summary1/warranty_amc_summary1.txt
deleted file mode 100644
index dd3a075944..0000000000
--- a/maintenance/search_criteria/warranty_amc_summary1/warranty_amc_summary1.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': None,
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Warranty/AMC Summary1',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Serial No',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Serial No\x01Saved':1,'Serial No\x01Status':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2011-05-09 11:23:09',
-		'modified_by': 'Administrator',
-		'module': 'Maintenance',
-		'name': 'warranty-amc_summary1',
-		'owner': 'Administrator',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
-		'sort_by': 'name',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/mapper/DocType Mapper/Enquiry-Service Quotation/Enquiry-Service Quotation.txt b/mapper/DocType Mapper/Enquiry-Service Quotation/Enquiry-Service Quotation.txt
deleted file mode 100644
index 7c0565a326..0000000000
--- a/mapper/DocType Mapper/Enquiry-Service Quotation/Enquiry-Service Quotation.txt	
+++ /dev/null
@@ -1 +0,0 @@
-[{'modified_by': 'Administrator', 'name': 'Enquiry-Service Quotation', 'parent': None, 'to_doctype': 'Service Quotation', 'creation': '2010-06-08 11:14:00', 'modified': '2010-06-08 11:14:00', 'module': 'Mapper', 'doctype': 'DocType Mapper', 'idx': None, 'parenttype': None, 'ref_doc_submitted': None, 'owner': 'Administrator', 'docstatus': 0, 'from_doctype': 'Enquiry', 'parentfield': None}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00708', 'parent': 'Enquiry-Service Quotation', 'to_field': 'contact_no', 'creation': '2010-06-08 11:14:00', 'modified': '2010-06-08 11:14:00', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'contact_no', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00709', 'parent': 'Enquiry-Service Quotation', 'to_field': 'enq_det', 'creation': '2010-06-08 11:14:00', 'modified': '2010-06-08 11:14:00', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 2, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'subject', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00710', 'parent': 'Enquiry-Service Quotation', 'to_field': 'source', 'creation': '2010-06-08 11:14:00', 'modified': '2010-06-08 11:14:00', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 3, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'source', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00711', 'parent': 'Enquiry-Service Quotation', 'to_field': 'campaign', 'creation': '2010-06-08 11:14:00', 'modified': '2010-06-08 11:14:00', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 4, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'campaign', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00712', 'parent': 'Enquiry-Service Quotation', 'to_field': 'enq_no', 'creation': '2010-06-08 11:14:00', 'modified': '2010-06-08 11:14:00', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 5, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00713', 'parent': 'Enquiry-Service Quotation', 'to_field': 'customer_name', 'creation': '2010-06-08 11:14:00', 'modified': '2010-06-08 11:14:00', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 6, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'customer', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00714', 'parent': 'Enquiry-Service Quotation', 'to_field': 'email_id', 'creation': '2010-06-08 11:14:00', 'modified': '2010-06-08 11:14:00', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 7, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'email_id', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00715', 'parent': 'Enquiry-Service Quotation', 'to_field': 'contact_person', 'creation': '2010-06-08 11:14:00', 'modified': '2010-06-08 11:14:00', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 8, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'contact_person', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00716', 'parent': 'Enquiry-Service Quotation', 'to_field': 'customer_group', 'creation': '2010-06-08 11:14:00', 'modified': '2010-06-08 11:14:00', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 9, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'customer_group', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00717', 'parent': 'Enquiry-Service Quotation', 'to_field': 'customer_address', 'creation': '2010-06-08 11:14:00', 'modified': '2010-06-08 11:14:00', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 10, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'address', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00718', 'parent': 'Enquiry-Service Quotation', 'to_field': 'cost_center', 'creation': '2010-06-08 11:14:00', 'modified': '2010-06-08 11:14:00', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 11, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'cost_center', 'parentfield': 'field_mapper_details'}, {'reference_key': '', 'modified_by': 'Administrator', 'name': 'TMD/0000068', 'parent': 'Enquiry-Service Quotation', 'is_reference_table': None, 'to_field': '', 'creation': '2010-06-08 11:14:00', 'reference_doctype_key': '', 'modified': '2010-06-08 11:14:00', 'doctype': 'Table Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'from_table': 'Enquiry', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'Service Quotation', 'from_field': '', 'validation_logic': 'name is not null', 'parentfield': 'table_mapper_details'}]
\ No newline at end of file
diff --git a/mapper/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt b/mapper/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt
deleted file mode 100644
index 4ce80bf6b5..0000000000
--- a/mapper/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt	
+++ /dev/null
@@ -1 +0,0 @@
-[{'modified_by': 'jai@webnotestech.com', 'name': 'Indent-Purchase Order', 'parent': None, 'to_doctype': 'Purchase Order', 'creation': '2009-03-12 12:10:22', 'modified': '2009-12-30 16:55:33', 'module': 'Mapper', 'doctype': 'DocType Mapper', 'idx': None, 'parenttype': '', 'ref_doc_submitted': 1, 'owner': 'Administrator', 'docstatus': 0, 'from_doctype': 'Indent', 'parentfield': ''}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00165', 'parent': 'Indent-Purchase Order', 'to_field': 'fiscal_year', 'creation': '2009-03-12 12:10:22', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'fiscal_year', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00164', 'parent': 'Indent-Purchase Order', 'to_field': 'company', 'creation': '2009-03-12 12:10:22', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 2, 'parenttype': 'DocType Mapper', 'checking_operator': '=', 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'company', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00544', 'parent': 'Indent-Purchase Order', 'to_field': 'prevdoc_doctype', 'creation': '2009-09-21 13:13:48', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 3, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'parenttype', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00163', 'parent': 'Indent-Purchase Order', 'to_field': 'prevdoc_docname', 'creation': '2009-03-12 12:10:22', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 4, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'parent', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00162', 'parent': 'Indent-Purchase Order', 'to_field': 'prevdoc_detail_docname', 'creation': '2009-03-12 12:10:22', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 5, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00155', 'parent': 'Indent-Purchase Order', 'to_field': 'stock_uom', 'creation': '2009-03-12 12:10:22', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 6, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'uom', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00168', 'parent': 'Indent-Purchase Order', 'to_field': 'conversion_factor', 'creation': '2009-03-13 13:18:32', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 7, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'eval:flt(1)', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00166', 'parent': 'Indent-Purchase Order', 'to_field': 'uom', 'creation': '2009-03-12 17:24:05', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 8, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'uom', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00157', 'parent': 'Indent-Purchase Order', 'to_field': 'warehouse', 'creation': '2009-03-12 12:10:22', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 9, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'warehouse', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00160', 'parent': 'Indent-Purchase Order', 'to_field': 'schedule_date', 'creation': '2009-03-12 12:10:22', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 10, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'schedule_date', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00159', 'parent': 'Indent-Purchase Order', 'to_field': 'item_code', 'creation': '2009-03-12 12:10:22', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 11, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'item_code', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00244', 'parent': 'Indent-Purchase Order', 'to_field': 'item_name', 'creation': '2009-03-25 17:36:50', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 12, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'item_name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00243', 'parent': 'Indent-Purchase Order', 'to_field': 'brand', 'creation': '2009-03-25 17:36:50', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 13, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'brand', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00158', 'parent': 'Indent-Purchase Order', 'to_field': 'description', 'creation': '2009-03-12 12:10:22', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 14, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'description', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00649', 'parent': 'Indent-Purchase Order', 'to_field': 'item_group', 'creation': '2009-12-22 14:59:02', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 15, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'from_field': 'item_group', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00253', 'parent': 'Indent-Purchase Order', 'to_field': 'stock_qty', 'creation': '2009-03-30 10:55:56', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 16, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'eval:flt(obj.qty) - flt(obj.ordered_qty)', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00602', 'parent': 'Indent-Purchase Order', 'to_field': 'qty', 'creation': '2009-11-18 15:10:27', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 17, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'from_field': 'eval:flt(obj.qty) - flt(obj.ordered_qty)', 'parentfield': 'field_mapper_details'}, {'reference_key': 'prevdoc_docname', 'modified_by': 'jai@webnotestech.com', 'name': 'TMD/0000017', 'parent': 'Indent-Purchase Order', 'is_reference_table': None, 'to_field': '', 'creation': '2009-03-12 12:10:22', 'reference_doctype_key': '', 'modified': '2009-12-30 16:55:33', 'doctype': 'Table Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'from_table': 'Indent', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'Purchase Order', 'from_field': '', 'validation_logic': 'docstatus = 1', 'parentfield': 'table_mapper_details'}, {'reference_key': '', 'modified_by': 'jai@webnotestech.com', 'name': 'TMD/0000018', 'parent': 'Indent-Purchase Order', 'is_reference_table': 1, 'to_field': 'po_details', 'creation': '2009-03-12 12:10:22', 'reference_doctype_key': 'prevdoc_doctype', 'modified': '2009-12-30 16:55:33', 'doctype': 'Table Mapper Detail', 'match_id': 1, 'idx': 2, 'parenttype': 'DocType Mapper', 'from_table': 'Indent Detail', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'PO Detail', 'from_field': 'indent_details', 'validation_logic': 'qty > ifnull(ordered_qty,0) and docstatus =1', 'parentfield': 'table_mapper_details'}]
\ No newline at end of file
diff --git a/mapper/DocType Mapper/Sales Order-Maintenance Report/Sales Order-Maintenance Report.txt b/mapper/DocType Mapper/Sales Order-Maintenance Report/Sales Order-Maintenance Report.txt
deleted file mode 100644
index fd74f39144..0000000000
--- a/mapper/DocType Mapper/Sales Order-Maintenance Report/Sales Order-Maintenance Report.txt	
+++ /dev/null
@@ -1 +0,0 @@
-[{'modified_by': 'ashwini@webnotestech.com', 'name': 'Sales Order-Maintenance Report', 'parent': None, 'to_doctype': 'Maintenance Report', 'creation': '2010-07-15 08:17:07', 'modified': '2010-07-28 08:01:17', 'module': 'Mapper', 'doctype': 'DocType Mapper', 'idx': None, 'parenttype': None, 'ref_doc_submitted': 1, 'owner': 'Administrator', 'docstatus': 0, 'from_doctype': 'Sales Order', 'parentfield': None}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00793', 'parent': 'Sales Order-Maintenance Report', 'to_field': 'customer_name', 'creation': '2010-07-15 08:17:07', 'modified': '2010-07-28 08:01:17', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'checking_operator': '=', 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'customer_name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00794', 'parent': 'Sales Order-Maintenance Report', 'to_field': 'address', 'creation': '2010-07-15 08:17:07', 'modified': '2010-07-28 08:01:17', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 2, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'customer_address', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00795', 'parent': 'Sales Order-Maintenance Report', 'to_field': 'contact_person', 'creation': '2010-07-15 08:17:07', 'modified': '2010-07-28 08:01:17', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 3, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'contact_person', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00796', 'parent': 'Sales Order-Maintenance Report', 'to_field': 'territory', 'creation': '2010-07-15 08:17:07', 'modified': '2010-07-28 08:01:17', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 4, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'territory', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00797', 'parent': 'Sales Order-Maintenance Report', 'to_field': 'company', 'creation': '2010-07-15 08:17:07', 'modified': '2010-07-28 08:01:17', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 5, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'company', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00798', 'parent': 'Sales Order-Maintenance Report', 'to_field': 'fiscal_year', 'creation': '2010-07-15 08:17:07', 'modified': '2010-07-28 08:01:17', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 6, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'fiscal_year', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00817', 'parent': 'Sales Order-Maintenance Report', 'to_field': 'sales_order_no', 'creation': '2010-07-27 14:55:55', 'modified': '2010-07-28 08:01:17', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 7, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'from_field': 'name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00799', 'parent': 'Sales Order-Maintenance Report', 'to_field': 'item_code', 'creation': '2010-07-15 08:17:07', 'modified': '2010-07-28 08:01:17', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 8, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'item_code', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00820', 'parent': 'Sales Order-Maintenance Report', 'to_field': 'description', 'creation': '2010-07-28 08:01:17', 'modified': '2010-07-28 08:01:17', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 9, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'from_field': 'description', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00807', 'parent': 'Sales Order-Maintenance Report', 'to_field': 'prevdoc_docname', 'creation': '2010-07-15 08:36:25', 'modified': '2010-07-28 08:01:17', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 10, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'parent', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00808', 'parent': 'Sales Order-Maintenance Report', 'to_field': 'prevdoc_doctype', 'creation': '2010-07-15 08:40:45', 'modified': '2010-07-28 08:01:17', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 11, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'parenttype', 'parentfield': 'field_mapper_details'}, {'reference_key': '', 'modified_by': 'ashwini@webnotestech.com', 'name': 'TMD/0000076', 'parent': 'Sales Order-Maintenance Report', 'is_reference_table': None, 'to_field': 'maintenance_report_details', 'creation': '2010-07-15 08:17:07', 'reference_doctype_key': '', 'modified': '2010-07-28 08:01:17', 'doctype': 'Table Mapper Detail', 'match_id': 1, 'idx': 1, 'parenttype': 'DocType Mapper', 'from_table': 'Sales Order Detail', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'Maintenance Report Detail', 'from_field': 'sales_order_details', 'validation_logic': 'docstatus=1', 'parentfield': 'table_mapper_details'}, {'reference_key': '', 'modified_by': 'ashwini@webnotestech.com', 'name': 'TMD/0000077', 'parent': 'Sales Order-Maintenance Report', 'is_reference_table': None, 'to_field': None, 'creation': '2010-07-15 08:17:07', 'reference_doctype_key': '', 'modified': '2010-07-28 08:01:17', 'doctype': 'Table Mapper Detail', 'match_id': 0, 'idx': 2, 'parenttype': 'DocType Mapper', 'from_table': 'Sales Order', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'Maintenance Report', 'from_field': None, 'validation_logic': 'docstatus=1', 'parentfield': 'table_mapper_details'}]
\ No newline at end of file
diff --git a/mapper/Module Def/Mapper/Mapper.txt b/mapper/Module Def/Mapper/Mapper.txt
deleted file mode 100644
index c2c06b5ad6..0000000000
--- a/mapper/Module Def/Mapper/Mapper.txt	
+++ /dev/null
@@ -1,29 +0,0 @@
-[
-	{
-		'_last_update': None,
-		'creation': '2010-11-30 22:41:12',
-		'disabled': None,
-		'docstatus': 0,
-		'doctype': 'Module Def',
-		'doctype_list': None,
-		'file_list': None,
-		'idx': None,
-		'is_hidden': None,
-		'last_updated_date': '2010-11-29 12:02:02',
-		'modified': '2010-09-25 00:00:00',
-		'modified_by': 'Administrator',
-		'module_desc': 'Mapper',
-		'module_icon': None,
-		'module_label': 'Mapper',
-		'module_name': 'Mapper',
-		'module_page': None,
-		'module_seq': None,
-		'name': 'Mapper',
-		'owner': 'saumil@webnotestech.com',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
-		'trash_reason': None,
-		'widget_code': None
-	}
-]
\ No newline at end of file
diff --git a/material_management/doctype/batch/batch.txt b/material_management/doctype/batch/batch.txt
deleted file mode 100644
index d4abe1a891..0000000000
--- a/material_management/doctype/batch/batch.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-27 13:54:26', 'search_fields': None, 'module': 'Material Management', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'harshada@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 13, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': 1, 'allow_print': None, 'autoname': '', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Batch', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00984', 'parent': 'Batch', 'read': 1, 'create': 1, 'creation': '2010-04-27 13:54:26', 'modified': '2010-09-20 08:57:05', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Material Master Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01001', 'parent': 'Batch', 'read': 1, 'create': None, 'creation': '2010-05-10 11:00:48', 'modified': '2010-09-20 08:57:05', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'Material Master Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-05-10 10:58:39', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Batch', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04990', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 08:57:05', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-27 13:54:26', 'doctype': 'DocField', 'oldfieldname': 'batch_id', 'owner': 'harshada@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Batch ID', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Batch', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04904', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 08:57:05', 'parenttype': 'DocType', 'fieldname': 'batch_id', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-27 13:54:26', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Batch', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04905', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-20 08:57:05', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-04-27 13:54:26', 'doctype': 'DocField', 'oldfieldname': 'start_date', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Batch Started Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Batch', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04906', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-09-20 08:57:05', 'parenttype': 'DocType', 'fieldname': 'start_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-04-27 13:54:26', 'doctype': 'DocField', 'oldfieldname': 'finished_date', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Batch Finished Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Batch', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04907', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-09-20 08:57:05', 'parenttype': 'DocType', 'fieldname': 'finished_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-04-27 13:54:26', 'doctype': 'DocField', 'oldfieldname': 'expiry_date', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Expiry Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Batch', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04908', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-09-20 08:57:05', 'parenttype': 'DocType', 'fieldname': 'expiry_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-04-27 13:57:16', 'doctype': 'DocField', 'oldfieldname': 'item', 'owner': 'harshada@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Item', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Batch', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04909', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-09-20 08:57:05', 'parenttype': 'DocType', 'fieldname': 'item', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/material_management/doctype/bin/bin.txt b/material_management/doctype/bin/bin.txt
deleted file mode 100644
index 0bef20c2e4..0000000000
--- a/material_management/doctype/bin/bin.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-12-08 15:46:42', 'search_fields': 'item_code,warehouse', 'module': 'Material Management', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 1, 'read_only': 0, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 114, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': 'BIN/.#######', 'client_script_core': '', 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Bin', 'idx': None, 'hide_toolbar': 1, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00371', 'parent': 'Bin', 'read': 1, 'create': None, 'creation': '2010-12-08 15:46:42', 'modified': '2010-12-08 15:46:42', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 1, 'parenttype': 'DocType', 'role': 'Sales Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00372', 'parent': 'Bin', 'read': 1, 'create': None, 'creation': '2010-12-08 15:46:42', 'modified': '2010-12-08 15:46:42', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'Sales User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00373', 'parent': 'Bin', 'read': 1, 'create': None, 'creation': '2010-12-08 15:46:42', 'modified': '2010-12-08 15:46:42', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 3, 'parenttype': 'DocType', 'role': 'Purchase Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00374', 'parent': 'Bin', 'read': 1, 'create': None, 'creation': '2010-12-08 15:46:42', 'modified': '2010-12-08 15:46:42', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 4, 'parenttype': 'DocType', 'role': 'Purchase User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00375', 'parent': 'Bin', 'read': 1, 'create': 0, 'creation': '2010-12-08 15:46:42', 'modified': '2010-12-08 15:46:42', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 5, 'parenttype': 'DocType', 'role': 'Material User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00376', 'parent': 'Bin', 'read': 1, 'create': 0, 'creation': '2010-12-08 15:46:42', 'modified': '2010-12-08 15:46:42', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 6, 'parenttype': 'DocType', 'role': 'Material Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-12-08 15:46:42', 'doctype': 'DocField', 'oldfieldname': 'warehouse', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Warehouse', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Bin', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02254', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:42', 'parenttype': 'DocType', 'fieldname': 'warehouse', 'fieldtype': 'Link', 'options': 'Warehouse', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-12-08 15:46:42', 'doctype': 'DocField', 'oldfieldname': 'warehouse_type', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Warehouse Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Bin', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02255', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:42', 'parenttype': 'DocType', 'fieldname': 'warehouse_type', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-12-08 15:46:42', 'doctype': 'DocField', 'oldfieldname': 'item_code', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Item Code', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Bin', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02256', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:42', 'parenttype': 'DocType', 'fieldname': 'item_code', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-12-08 15:46:42', 'doctype': 'DocField', 'oldfieldname': 'stock_uom', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'UOM', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Bin', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02257', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:42', 'parenttype': 'DocType', 'fieldname': 'stock_uom', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-12-08 15:46:42', 'doctype': 'DocField', 'oldfieldname': 'reserved_qty', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Reserved Quantity', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Bin', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02258', 'idx': 5, 'default': '0.00', 'colour': None, 'modified': '2010-12-08 15:46:42', 'parenttype': 'DocType', 'fieldname': 'reserved_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-12-08 15:46:42', 'doctype': 'DocField', 'oldfieldname': 'actual_qty', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Actual Quantity', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Bin', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02259', 'idx': 6, 'default': '0.00', 'colour': None, 'modified': '2010-12-08 15:46:42', 'parenttype': 'DocType', 'fieldname': 'actual_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-12-08 15:46:42', 'doctype': 'DocField', 'oldfieldname': 'ordered_qty', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Ordered Quantity', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Bin', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02260', 'idx': 7, 'default': '0.00', 'colour': None, 'modified': '2010-12-08 15:46:42', 'parenttype': 'DocType', 'fieldname': 'ordered_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-12-08 15:46:42', 'doctype': 'DocField', 'oldfieldname': 'indented_qty', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Indented Quantity', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Bin', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02261', 'idx': 8, 'default': '0.00', 'colour': None, 'modified': '2010-12-08 15:46:42', 'parenttype': 'DocType', 'fieldname': 'indented_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-12-08 15:46:42', 'doctype': 'DocField', 'oldfieldname': 'planned_qty', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Planned Qty', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Bin', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02262', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:42', 'parenttype': 'DocType', 'fieldname': 'planned_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-12-08 15:46:42', 'doctype': 'DocField', 'oldfieldname': 'projected_qty', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Projected Qty', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Bin', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02263', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:42', 'parenttype': 'DocType', 'fieldname': 'projected_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-12-08 15:46:42', 'doctype': 'DocField', 'oldfieldname': 'ma_rate', 'owner': 'Administrator', 'reqd': None, 'in_filter': 0, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Moving Average Rate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Bin', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL02264', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:42', 'parenttype': 'DocType', 'fieldname': 'ma_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-12-08 15:46:43', 'doctype': 'DocField', 'oldfieldname': 'fcfs_rate', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'FCFS Rate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Bin', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02265', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:43', 'parenttype': 'DocType', 'fieldname': 'fcfs_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-12-08 15:46:43', 'doctype': 'DocField', 'oldfieldname': 'valuation_rate', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Valuation Rate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Bin', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02266', 'idx': 13, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:43', 'parenttype': 'DocType', 'fieldname': 'valuation_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-12-08 15:46:43', 'doctype': 'DocField', 'oldfieldname': 'stock_value', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Stock Value', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Bin', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02267', 'idx': 14, 'default': None, 'colour': None, 'modified': '2010-12-08 15:46:43', 'parenttype': 'DocType', 'fieldname': 'stock_value', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/material_management/doctype/delivery_note/delivery_note.txt b/material_management/doctype/delivery_note/delivery_note.txt
deleted file mode 100644
index 6b9c8c941f..0000000000
--- a/material_management/doctype/delivery_note/delivery_note.txt
+++ /dev/null
@@ -1,3672 +0,0 @@
-[
-	{
-		'_last_update': '1308741898',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:57',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Transaction',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': 0,
-		'in_dialog': None,
-		'is_transaction_doc': 1,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'module': 'Material Management',
-		'name': 'Delivery Note',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': 1,
-		'search_fields': 'status,transaction_date,customer,customer_name, territory,grand_total',
-		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': 'To %(customer_name)s on %(transaction_date)s | %(per_billed)s% billed',
-		'tag_fields': 'billing_status',
-		'use_template': None,
-		'version': 444
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:08:57',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'PERM00175',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Material User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:08:57',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'PERM00176',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Material User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:08:57',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'PERM00177',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Material Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:08:57',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'PERM00178',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Material Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:08:57',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'PERM00179',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:08:57',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'PERM00180',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': None,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:08:57',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 7,
-		'match': None,
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'PERM00181',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Accounts User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:08:57',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 8,
-		'match': None,
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'PERM00182',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Accounts User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:08:57',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 9,
-		'match': 'customer_name',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'PERM00183',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Customer',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:08:57',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 10,
-		'match': None,
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'PERM00184',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Delivery Note',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'read': 1,
-		'role': 'All',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Basic Info',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05576',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05577',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': 'To manage multiple series please go to Setup > Manage Series',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'naming_series',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Series',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00910',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'naming_series',
-		'oldfieldtype': 'Select',
-		'options': 'DN',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Customer',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL03784',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer',
-		'oldfieldtype': 'Link',
-		'options': 'Customer',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_address',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': 1,
-		'label': 'Shipping Address',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00913',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Address',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_person',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': 1,
-		'label': 'Contact Person',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00915',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Contact',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Customer Name',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00912',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-24 10:14:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'address_display',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Shipping Address',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05105',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-24 10:14:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_display',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Contact',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05106',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-24 10:14:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_mobile',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Mobile No',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05107',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-24 10:14:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_email',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Contact Email',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05108',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05578',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:57',
-		'default': 'Today',
-		'depends_on': None,
-		'description': 'The date at which current entry is made in system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'transaction_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': 1,
-		'label': 'Voucher Date',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00921',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'transaction_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': 'Draft',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': 1,
-		'label': 'Status',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00911',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Select',
-		'options': '\nDraft\nSubmitted\nCancelled',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': '% of materials billed against this Delivery Note',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'per_billed',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': 1,
-		'label': '% Qty Billed',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00922',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'per_billed',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': '% of materials delivered against this Delivery Note',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'per_installed',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': 1,
-		'label': '% Installed',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00923',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'per_installed',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 0,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Amended From',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00917',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': 'The date at which current entry is corrected in the system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Amendment Date',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00918',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'territory',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 19,
-		'in_filter': 1,
-		'label': 'Territory',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00914',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Territory',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_group',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': 1,
-		'label': 'Customer Group',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00971',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Customer Group',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
-		'label': 'Transporter Info',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05579',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'transporter_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
-		'label': 'Transporter Name',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00919',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'transporter_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': 'Transporter lorry number',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'lr_no',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': None,
-		'label': 'LR No',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00926',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'lr_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': 'Today',
-		'depends_on': None,
-		'description': 'Date on which lorry started from your warehouse',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'lr_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 24,
-		'in_filter': None,
-		'label': 'LR Date',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00927',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'lr_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 25,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05580',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'challan_no',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 26,
-		'in_filter': None,
-		'label': 'Challan No',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00928',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'challan_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'sneha@webnotestech.com',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'challan_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 27,
-		'in_filter': None,
-		'label': 'Challan Date',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00929',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'challan_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'sneha@webnotestech.com',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 28,
-		'in_filter': None,
-		'label': 'Items',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05581',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': 'You can make a delivery note from multiple sales orders. Select sales orders one by one and click on the button below.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'sales_order_no',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 29,
-		'in_filter': None,
-		'label': 'Sales Order No',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00931',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'sales_order_no',
-		'oldfieldtype': 'Link',
-		'options': 'Sales Order',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': 0,
-		'icon': None,
-		'idx': 30,
-		'in_filter': None,
-		'label': 'Get Items',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00932',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'pull_sales_order_details',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': 'Select the price list as entered in "Price List" master. This will pull the reference rates of items against this price list as specified in "Item" master.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'price_list_name',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 31,
-		'in_filter': None,
-		'label': 'Price List',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00933',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'price_list_name',
-		'oldfieldtype': 'Select',
-		'options': 'link:Price List',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 32,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05582',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': "Customer's Currency",
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'currency',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 33,
-		'in_filter': None,
-		'label': 'Currency',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00924',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'currency',
-		'oldfieldtype': 'Select',
-		'options': 'link:Currency',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:57',
-		'default': '1.00',
-		'depends_on': None,
-		'description': "Rate at which customer's currency is converted to your currency",
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'conversion_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 34,
-		'in_filter': None,
-		'label': 'Conversion Rate',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00925',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'conversion_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 35,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05583',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'delivery_note_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 36,
-		'in_filter': None,
-		'label': 'Delivery Note Details',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00934',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'delivery_note_details',
-		'oldfieldtype': 'Table',
-		'options': 'Delivery Note Detail',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'net_total',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 37,
-		'in_filter': None,
-		'label': 'Net Total*',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00935',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'net_total',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 38,
-		'in_filter': None,
-		'label': 'Re-Calculate Values',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00936',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 39,
-		'in_filter': None,
-		'label': 'Note',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05584',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': 'NOTE :* In Base Currency',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 40,
-		'in_filter': None,
-		'label': 'Taxes',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05585',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': 'If you have created a standard template in Other Charges master, select one and click on the button below.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'charge',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 41,
-		'in_filter': None,
-		'label': 'Charge',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00939',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'charge',
-		'oldfieldtype': 'Link',
-		'options': 'Other Charges',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 42,
-		'in_filter': None,
-		'label': 'Get Charges',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00940',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'other_charges',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 43,
-		'in_filter': None,
-		'label': 'Other Charges',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00941',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'other_charges',
-		'oldfieldtype': 'Table',
-		'options': 'RV Tax Detail',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'other_charges_total',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 44,
-		'in_filter': None,
-		'label': 'Charges Total',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00945',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'other_charges_total',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 45,
-		'in_filter': None,
-		'label': 'Calculate Charges',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00942',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 46,
-		'in_filter': None,
-		'label': 'Other Charges Calculation',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05586',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 47,
-		'in_filter': None,
-		'label': 'Totals',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05587',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'sneha@webnotestech.com',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'grand_total',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 48,
-		'in_filter': None,
-		'label': 'Grand Total',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00946',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'grand_total',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'rounded_total',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 49,
-		'in_filter': None,
-		'label': 'Rounded Total',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00947',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'rounded_total',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': 'In Words will be visible once you save the Delivery Note.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'in_words',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 50,
-		'in_filter': None,
-		'label': 'In Words',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00948',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'in_words',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '200px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 51,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05588',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'sneha@webnotestech.com',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'grand_total_export',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 52,
-		'in_filter': None,
-		'label': 'Grand Total (Export)',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00950',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'grand_total_export',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'rounded_total_export',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 53,
-		'in_filter': None,
-		'label': 'Rounded Total (Export)',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00951',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'rounded_total_export',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': 'In Words (Export) will be visible once you save the Delivery Note.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'in_words_export',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 54,
-		'in_filter': None,
-		'label': 'In Words (Export)',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00952',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'in_words_export',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 55,
-		'in_filter': None,
-		'label': 'Terms',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05589',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'tc_name',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 56,
-		'in_filter': None,
-		'label': 'Select Terms',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00954',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'tc_name',
-		'oldfieldtype': 'Link',
-		'options': 'Term',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 57,
-		'in_filter': None,
-		'label': 'Get Terms',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00955',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'get_tc_details',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Server',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 58,
-		'in_filter': None,
-		'label': 'Terms HTML',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05590',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': 'You can add Terms and Notes that will be printed in the Transaction',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'terms',
-		'fieldtype': 'Text Editor',
-		'hidden': None,
-		'icon': None,
-		'idx': 59,
-		'in_filter': None,
-		'label': 'Term Details',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00957',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'terms',
-		'oldfieldtype': 'Text Editor',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': 'Filling in Additional Information about the Delivery Note will help you analyze your data better.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 60,
-		'in_filter': None,
-		'label': 'More Info',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05591',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': 'Select the relevant company name if you have multiple companies',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 61,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00967',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 62,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00968',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': 'Today',
-		'depends_on': None,
-		'description': 'The date at which current entry will get or has actually executed.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'posting_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 63,
-		'in_filter': 1,
-		'label': 'Posting Date',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00959',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'posting_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': 'Time at which items were delivered from warehouse',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'posting_time',
-		'fieldtype': 'Time',
-		'hidden': None,
-		'icon': None,
-		'idx': 64,
-		'in_filter': 0,
-		'label': 'Posting Time',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00960',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'posting_time',
-		'oldfieldtype': 'Time',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 0,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:48:01',
-		'default': None,
-		'depends_on': None,
-		'description': 'Track this Delivery Note against any Project',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'project_name',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 65,
-		'in_filter': 1,
-		'label': 'Project Name',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL03783',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'project_name',
-		'oldfieldtype': 'Link',
-		'options': 'Project',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': 'Required only for sample item.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'to_warehouse',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 66,
-		'in_filter': None,
-		'label': 'To Warehouse',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00963',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'to_warehouse',
-		'oldfieldtype': 'Link',
-		'options': 'Warehouse',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 67,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05592',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:38',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'billing_status',
-		'fieldtype': 'Select',
-		'hidden': 1,
-		'icon': None,
-		'idx': 68,
-		'in_filter': None,
-		'label': 'Billing Status',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05572',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': '\nNot Billed\nPartly Billed\nFully Billed',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:38',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'installation_status',
-		'fieldtype': 'Select',
-		'hidden': 1,
-		'icon': None,
-		'idx': 69,
-		'in_filter': None,
-		'label': 'Installation Status',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05573',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'po_no',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 70,
-		'in_filter': None,
-		'label': 'P.O. No',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00974',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'po_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'po_date',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 71,
-		'in_filter': None,
-		'label': 'P.O. Date',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00975',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'po_date',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-12-14 10:23:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'letter_head',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 72,
-		'in_filter': None,
-		'label': 'Letter Head',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL04234',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'letter_head',
-		'oldfieldtype': 'Link',
-		'options': 'link:Letter Head',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'source',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 73,
-		'in_filter': None,
-		'label': 'Source',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00961',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'source',
-		'oldfieldtype': 'Select',
-		'options': "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': "eval:doc.source == 'Campaign'",
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'campaign',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 74,
-		'in_filter': None,
-		'label': 'Campaign',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00962',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'campaign',
-		'oldfieldtype': 'Link',
-		'options': 'Campaign',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'select_print_heading',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 75,
-		'in_filter': None,
-		'label': 'Select Print Heading',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00969',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'select_print_heading',
-		'oldfieldtype': 'Link',
-		'options': 'Print Heading',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'print_without_amount',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 76,
-		'in_filter': None,
-		'label': 'Print Without Amount',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00966',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'print_without_amount',
-		'oldfieldtype': 'Check',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'instructions',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 77,
-		'in_filter': None,
-		'label': 'Instructions',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00964',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'instructions',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'sneha@webnotestech.com',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'cancel_reason',
-		'fieldtype': 'Data',
-		'hidden': 0,
-		'icon': None,
-		'idx': 78,
-		'in_filter': None,
-		'label': 'Cancel Reason',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00976',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'cancel_reason',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'excise_page',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 79,
-		'in_filter': None,
-		'label': 'Excise Page Number',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00977',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'excise_page',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 80,
-		'in_filter': None,
-		'label': 'Sales Team',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05593',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 81,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05594',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'sales_partner',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 82,
-		'in_filter': None,
-		'label': 'Sales Partner',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00981',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'sales_partner',
-		'oldfieldtype': 'Link',
-		'options': 'Sales Partner',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'commission_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 83,
-		'in_filter': None,
-		'label': 'Commission Rate (%)',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00982',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'commission_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'total_commission',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 84,
-		'in_filter': None,
-		'label': 'Total Commission',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00983',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'total_commission',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 85,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05595',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'sales_team',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 86,
-		'in_filter': None,
-		'label': 'Sales Team1',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00984',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'sales_team',
-		'oldfieldtype': 'Table',
-		'options': 'Sales Team',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': 1,
-		'icon': None,
-		'idx': 87,
-		'in_filter': None,
-		'label': 'Supplier Details',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05596',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier',
-		'fieldtype': 'Link',
-		'hidden': 1,
-		'icon': None,
-		'idx': 88,
-		'in_filter': None,
-		'label': 'Supplier',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00986',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'supplier',
-		'oldfieldtype': 'Link',
-		'options': 'Supplier',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier_address',
-		'fieldtype': 'Text',
-		'hidden': 1,
-		'icon': None,
-		'idx': 89,
-		'in_filter': None,
-		'label': 'Supplier Address',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00987',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'supplier_address',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 0,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'purchase_receipt_no',
-		'fieldtype': 'Link',
-		'hidden': 1,
-		'icon': None,
-		'idx': 90,
-		'in_filter': None,
-		'label': 'Purchase Receipt No',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00988',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'purchase_receipt_no',
-		'oldfieldtype': 'Link',
-		'options': 'Purchase Receipt',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'purchase_order_no',
-		'fieldtype': 'Link',
-		'hidden': 1,
-		'icon': None,
-		'idx': 91,
-		'in_filter': None,
-		'label': 'Purchase Order',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00989',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'purchase_order_no',
-		'oldfieldtype': 'Link',
-		'options': 'Purchase Order',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-03 12:34:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 92,
-		'in_filter': None,
-		'label': 'Packing List',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL05597',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'packing_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 93,
-		'in_filter': None,
-		'label': 'Packing Details',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00991',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'packing_details',
-		'oldfieldtype': 'Table',
-		'options': 'Delivery Note Packing Detail',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 94,
-		'in_filter': None,
-		'label': 'Repair Delivery Note',
-		'modified': '2011-06-27 16:42:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00995',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'repair_delivery_note',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Delivery Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/material_management/doctype/delivery_note_detail/delivery_note_detail.txt b/material_management/doctype/delivery_note_detail/delivery_note_detail.txt
deleted file mode 100644
index 159b91b62d..0000000000
--- a/material_management/doctype/delivery_note_detail/delivery_note_detail.txt
+++ /dev/null
@@ -1,1070 +0,0 @@
-[
-	{
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'DND/.#######',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': 1,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'module': 'Material Management',
-		'name': 'Delivery Note Detail',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Tray',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 35
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_code',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': 1,
-		'label': 'Item Code',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01000',
-		'no_copy': None,
-		'oldfieldname': 'item_code',
-		'oldfieldtype': 'Link',
-		'options': 'Item',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Item Name',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01001',
-		'no_copy': None,
-		'oldfieldname': 'item_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Description',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01002',
-		'no_copy': None,
-		'oldfieldname': 'description',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': '200px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'stock_uom',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'UOM',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01003',
-		'no_copy': None,
-		'oldfieldname': 'stock_uom',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': '50px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'no_of_packs',
-		'fieldtype': 'Int',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'No of Packs',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01004',
-		'no_copy': None,
-		'oldfieldname': 'no_of_packs',
-		'oldfieldtype': 'Int',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': '0.00',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'qty',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Quantity',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01005',
-		'no_copy': None,
-		'oldfieldname': 'qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': '0.00',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'ref_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Ref Rate',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01006',
-		'no_copy': 0,
-		'oldfieldname': 'ref_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': '0.00',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'adj_rate',
-		'fieldtype': 'Float',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Discount (%)',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01007',
-		'no_copy': None,
-		'oldfieldname': 'adj_rate',
-		'oldfieldtype': 'Float',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'export_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Rate',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01008',
-		'no_copy': None,
-		'oldfieldname': 'export_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'export_amount',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Amount',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01009',
-		'no_copy': None,
-		'oldfieldname': 'export_amount',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'base_ref_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Ref Rate*',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01010',
-		'no_copy': None,
-		'oldfieldname': 'base_ref_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': '0.00',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'basic_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Rate*',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01011',
-		'no_copy': None,
-		'oldfieldname': 'basic_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amount',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Amount*',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01012',
-		'no_copy': None,
-		'oldfieldname': 'amount',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'warehouse',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Warehouse',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01013',
-		'no_copy': None,
-		'oldfieldname': 'warehouse',
-		'oldfieldtype': 'Link',
-		'options': 'Warehouse',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'serial_no',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Serial No',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01014',
-		'no_copy': None,
-		'oldfieldname': 'serial_no',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'batch_no',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': 'Batch No',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01015',
-		'no_copy': None,
-		'oldfieldname': 'batch_no',
-		'oldfieldtype': 'Link',
-		'options': 'Batch',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_group',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Item Group',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01016',
-		'no_copy': None,
-		'oldfieldname': 'item_group',
-		'oldfieldtype': 'Link',
-		'options': 'Item Group',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'brand',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Brand Name',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01017',
-		'no_copy': None,
-		'oldfieldname': 'brand',
-		'oldfieldtype': 'Link',
-		'options': 'Brand',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'pack_unit',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Pack Unit',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01018',
-		'no_copy': None,
-		'oldfieldname': 'pack_unit',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'installed_qty',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'Installed Qty',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01019',
-		'no_copy': 1,
-		'oldfieldname': 'installed_qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'actual_qty',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
-		'label': 'Available Qty at Warehouse',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01020',
-		'no_copy': 1,
-		'oldfieldname': 'actual_qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': '0.00',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'billed_qty',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
-		'label': 'Billed Qty',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01021',
-		'no_copy': 1,
-		'oldfieldname': 'billed_qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-01 10:35:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'billed_amt',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': None,
-		'label': 'Billed Amt',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL04938',
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'prevdoc_docname',
-		'fieldtype': 'Data',
-		'hidden': 0,
-		'icon': None,
-		'idx': 24,
-		'in_filter': 1,
-		'label': 'Against Document No',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01022',
-		'no_copy': 1,
-		'oldfieldname': 'prevdoc_docname',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'prevdoc_doctype',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 25,
-		'in_filter': 1,
-		'label': 'Document Type',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01023',
-		'no_copy': None,
-		'oldfieldname': 'prevdoc_doctype',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'prevdoc_date',
-		'fieldtype': 'Date',
-		'hidden': 1,
-		'icon': None,
-		'idx': 26,
-		'in_filter': 1,
-		'label': 'Against Document Date',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01024',
-		'no_copy': None,
-		'oldfieldname': 'prevdoc_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'prevdoc_detail_docname',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 27,
-		'in_filter': 1,
-		'label': 'Against Document Detail No',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01025',
-		'no_copy': None,
-		'oldfieldname': 'prevdoc_detail_docname',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_tax_rate',
-		'fieldtype': 'Small Text',
-		'hidden': 1,
-		'icon': None,
-		'idx': 28,
-		'in_filter': None,
-		'label': 'Item Tax Rate',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01026',
-		'no_copy': None,
-		'oldfieldname': 'item_tax_rate',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'page_break',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 29,
-		'in_filter': None,
-		'label': 'Page Break',
-		'modified': '2011-03-01 10:35:06',
-		'modified_by': 'Administrator',
-		'name': 'FL01027',
-		'no_copy': None,
-		'oldfieldname': 'page_break',
-		'oldfieldtype': 'Check',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/material_management/doctype/delivery_note_packing_detail/delivery_note_packing_detail.txt b/material_management/doctype/delivery_note_packing_detail/delivery_note_packing_detail.txt
deleted file mode 100644
index 3ba01dffb2..0000000000
--- a/material_management/doctype/delivery_note_packing_detail/delivery_note_packing_detail.txt
+++ /dev/null
@@ -1,687 +0,0 @@
-[
-	{
-		'_last_update': None,
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': 1,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-03-14 14:50:55',
-		'modified_by': 'Administrator',
-		'module': 'Material Management',
-		'name': 'Delivery Note Packing Detail',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Tray',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 17
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'parent_item',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Parent Item',
-		'modified': '2011-05-09 11:04:35',
-		'modified_by': 'Administrator',
-		'name': 'FL01028',
-		'no_copy': None,
-		'oldfieldname': 'parent_item',
-		'oldfieldtype': 'Link',
-		'options': 'Item',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Packing Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_code',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': 1,
-		'label': 'Item Code',
-		'modified': '2011-05-09 11:04:35',
-		'modified_by': 'Administrator',
-		'name': 'FL01029',
-		'no_copy': None,
-		'oldfieldname': 'item_code',
-		'oldfieldtype': 'Link',
-		'options': 'Item',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Packing Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:47:53',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 1,
-		'label': 'Item Name',
-		'modified': '2011-05-09 11:04:35',
-		'modified_by': 'Administrator',
-		'name': 'FL03784',
-		'no_copy': None,
-		'oldfieldname': 'item_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Delivery Note Packing Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'parent_detail_docname',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Parent Detail docname',
-		'modified': '2011-05-09 11:04:35',
-		'modified_by': 'Administrator',
-		'name': 'FL01030',
-		'no_copy': 1,
-		'oldfieldname': 'parent_detail_docname',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Delivery Note Packing Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Description',
-		'modified': '2011-05-09 11:04:35',
-		'modified_by': 'Administrator',
-		'name': 'FL01031',
-		'no_copy': None,
-		'oldfieldname': 'description',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Packing Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '300px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'warehouse',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Warehouse',
-		'modified': '2011-05-09 11:04:35',
-		'modified_by': 'Administrator',
-		'name': 'FL01034',
-		'no_copy': None,
-		'oldfieldname': 'warehouse',
-		'oldfieldtype': 'Link',
-		'options': 'Warehouse',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Packing Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'qty',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Qty',
-		'modified': '2011-05-09 11:04:35',
-		'modified_by': 'Administrator',
-		'name': 'FL01032',
-		'no_copy': None,
-		'oldfieldname': 'qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Packing Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:04:35',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'serial_no',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Serial No',
-		'modified': '2011-05-09 11:04:35',
-		'modified_by': 'Administrator',
-		'name': '000000471',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Packing Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'actual_qty',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Actual Qty',
-		'modified': '2011-05-09 11:04:35',
-		'modified_by': 'Administrator',
-		'name': 'FL01035',
-		'no_copy': 1,
-		'oldfieldname': 'actual_qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Packing Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-21 14:51:19',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'projected_qty',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Projected Qty',
-		'modified': '2011-05-09 11:04:35',
-		'modified_by': 'Administrator',
-		'name': 'FL04427',
-		'no_copy': 1,
-		'oldfieldname': 'projected_qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Packing Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'uom',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'UOM',
-		'modified': '2011-05-09 11:04:35',
-		'modified_by': 'Administrator',
-		'name': 'FL01033',
-		'no_copy': None,
-		'oldfieldname': 'uom',
-		'oldfieldtype': 'Link',
-		'options': 'UOM',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Packing Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'planned_qty',
-		'fieldtype': 'Currency',
-		'hidden': 1,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Planned Qty ',
-		'modified': '2011-05-09 11:04:35',
-		'modified_by': 'Administrator',
-		'name': 'FL01036',
-		'no_copy': 1,
-		'oldfieldname': 'planned_qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Packing Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'produced_qty',
-		'fieldtype': 'Currency',
-		'hidden': 1,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Produced Qty',
-		'modified': '2011-05-09 11:04:35',
-		'modified_by': 'Administrator',
-		'name': 'FL01037',
-		'no_copy': 1,
-		'oldfieldname': 'produced_qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Packing Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'prevdoc_doctype',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Prevdoc DocType',
-		'modified': '2011-05-09 11:04:35',
-		'modified_by': 'Administrator',
-		'name': 'FL01038',
-		'no_copy': None,
-		'oldfieldname': 'prevdoc_doctype',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Packing Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': 'The date at which current entry is made in system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'transaction_date',
-		'fieldtype': 'Date',
-		'hidden': 0,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Sales Order Date',
-		'modified': '2011-05-09 11:04:35',
-		'modified_by': 'Administrator',
-		'name': 'FL01039',
-		'no_copy': None,
-		'oldfieldname': 'transaction_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Packing Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'delivery_date',
-		'fieldtype': 'Date',
-		'hidden': 0,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': 'Expected Delivery Date',
-		'modified': '2011-05-09 11:04:35',
-		'modified_by': 'Administrator',
-		'name': 'FL01040',
-		'no_copy': None,
-		'oldfieldname': 'delivery_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Packing Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'confirmation_date',
-		'fieldtype': 'Date',
-		'hidden': 1,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Confirmed delivery date',
-		'modified': '2011-05-09 11:04:35',
-		'modified_by': 'Administrator',
-		'name': 'FL01041',
-		'no_copy': 1,
-		'oldfieldname': 'confirmation_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Packing Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-08-08 17:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'page_break',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Page Break',
-		'modified': '2011-05-09 11:04:35',
-		'modified_by': 'Administrator',
-		'name': 'FL01042',
-		'no_copy': None,
-		'oldfieldname': 'page_break',
-		'oldfieldtype': 'Check',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Delivery Note Packing Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/material_management/doctype/item/item.txt b/material_management/doctype/item/item.txt
deleted file mode 100644
index b1c0ef2dfc..0000000000
--- a/material_management/doctype/item/item.txt
+++ /dev/null
@@ -1,2294 +0,0 @@
-[
-	{
-		'_last_update': '1304919275',
-		'allow_attach': 1,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': 1,
-		'autoname': 'field:item_code',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': 1,
-		'menu_index': None,
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'module': 'Material Management',
-		'name': 'Item',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'item_name,description,item_group',
-		'section_style': 'Tray',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': '%(item_name)s',
-		'tag_fields': 'item_group',
-		'use_template': None,
-		'version': 153
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00280',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Material Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00281',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Material Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00282',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Material User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00283',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Material User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': None,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00284',
-		'owner': 'dhanalekshmi@webnotestech.com',
-		'parent': 'Item',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Material Master Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 0,
-		'creation': '2010-08-08 17:09:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00285',
-		'owner': 'dhanalekshmi@webnotestech.com',
-		'parent': 'Item',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Material Master Manager',
-		'submit': None,
-		'write': 0
-	},
-	{
-		'amend': None,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 7,
-		'match': None,
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00286',
-		'owner': 'dhanalekshmi@webnotestech.com',
-		'parent': 'Item',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 8,
-		'match': None,
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00287',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Item',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01606',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'trash_reason',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Trash Reason',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01605',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'trash_reason',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': 'Item will be saved by this name in the data base.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_code',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 0,
-		'label': 'Item Code',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01607',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'item_code',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Item Name',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01608',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'item_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': 'Classify your item in any one item group by clicking on the magnifying glass',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_group',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': 1,
-		'label': 'Item Group',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01609',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'item_group',
-		'oldfieldtype': 'Link',
-		'options': 'Item Group',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'IGHelp',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01610',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': 'To manage Item Group, click here',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'brand',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Brand',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01614',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'brand',
-		'oldfieldtype': 'Link',
-		'options': 'Brand',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-25 14:19:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': '000000642',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': 0,
-		'label': 'Description',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01612',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'description',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 0,
-		'trigger': None,
-		'width': '300px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-28 09:32:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'description_html',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Description HTML',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': '000000677',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-04-25 14:19:11',
-		'default': None,
-		'depends_on': None,
-		'description': 'Generates HTML to include image (1st attachment) in the description',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Add Image',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': '000000643',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Inventory',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01615',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': 'Enter unit of measurement in which stock of this item is maintained in your warehouse.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'stock_uom',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Default UoM',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01611',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'stock_uom',
-		'oldfieldtype': 'Link',
-		'options': 'UOM',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': 'Yes',
-		'depends_on': None,
-		'description': 'Select "Yes" if you are maintaining stock of this item in your Inventory.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_stock_item',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Is Stock Item',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01616',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'is_stock_item',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'valuation_method',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Valuation Method',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01617',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'valuation_method',
-		'oldfieldtype': 'Select',
-		'options': '\nFIFO\nMoving Average',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'default_warehouse',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': 'Default Warehouse',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01618',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'default_warehouse',
-		'oldfieldtype': 'Link',
-		'options': 'Warehouse',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': 'Percentage variation in quantity to be allowed while receiving or delivering this item.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'tolerance',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Allowance Percent',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01619',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'tolerance',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 're_order_level',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Re-Order Level',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01620',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 're_order_level',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': '0.00',
-		'depends_on': None,
-		'description': 'If stock level for this item has reached the minimum inventory level, system will prompt you to raise an Indent (Purchase Requisition).',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'minimum_inventory_level',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Minimum Inventory Level',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01621',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'minimum_inventory_level',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': '0.00',
-		'depends_on': None,
-		'description': 'You can enter the minimum quantity of this item to be ordered.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'min_order_qty',
-		'fieldtype': 'Currency',
-		'hidden': 0,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'Minimum Order Qty',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01622',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'min_order_qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01623',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': 'No',
-		'depends_on': None,
-		'description': 'Select "Yes" if this item is used for some internal purpose in your company.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_asset_item',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
-		'label': 'Is Asset Item',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01624',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'is_asset_item',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': 'No',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'has_batch_no',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': None,
-		'label': 'Has Batch No',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01625',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'has_batch_no',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': 'No',
-		'depends_on': None,
-		'description': 'Selecting "Yes" will give a unique identity to each entity of this item which can be viewed in the Serial No master.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'has_serial_no',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 24,
-		'in_filter': None,
-		'label': 'Has Serial No',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01626',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'has_serial_no',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'warranty_period',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 25,
-		'in_filter': None,
-		'label': 'Warranty Period (in days)',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01627',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'warranty_period',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'end_of_life',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 26,
-		'in_filter': None,
-		'label': 'End of Life',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01628',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'end_of_life',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 27,
-		'in_filter': None,
-		'label': 'Purchase Details',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01629',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': 'Yes',
-		'depends_on': None,
-		'description': 'Selecting "Yes" will allow this item to appear in Purchase Order , Purchase Receipt.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_purchase_item',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 28,
-		'in_filter': None,
-		'label': 'Is Purchase Item',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01630',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'is_purchase_item',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': 'Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Indent when you select this item.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'lead_time_days',
-		'fieldtype': 'Int',
-		'hidden': None,
-		'icon': None,
-		'idx': 29,
-		'in_filter': None,
-		'label': 'Lead Time Days',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01631',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'lead_time_days',
-		'oldfieldtype': 'Int',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': 'Default Purchase Account in which cost of the item will be debited.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'purchase_account',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 30,
-		'in_filter': None,
-		'label': 'Default Expense Account',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01632',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'purchase_account',
-		'oldfieldtype': 'Link',
-		'options': 'Account',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': 'Default Cost Center for tracking expense for this item.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'cost_center',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 31,
-		'in_filter': None,
-		'label': 'Default Cost Center',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01633',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'cost_center',
-		'oldfieldtype': 'Link',
-		'options': 'Cost Center',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': 'Buying Cost will be updated from Purchase Orders and Purchase Receipts. 
The buying cost will calculated by moving average method.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'buying_cost',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 32,
-		'in_filter': None,
-		'label': 'Buying Cost',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01634',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'buying_cost',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'last_purchase_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 33,
-		'in_filter': None,
-		'label': 'Last Purchase Rate',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01635',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'last_purchase_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'standard_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 34,
-		'in_filter': None,
-		'label': 'Standard Rate',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01636',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'standard_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 35,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01637',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'uom_conversion_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 36,
-		'in_filter': None,
-		'label': 'UOM Conversion Details',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01638',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'uom_conversion_details',
-		'oldfieldtype': 'Table',
-		'options': 'UOM Conversion Detail',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 37,
-		'in_filter': None,
-		'label': 'Sales Details',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01639',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': 'Yes',
-		'depends_on': None,
-		'description': 'Selecting "Yes" will allow this item to figure in Sales Order, Delivery Note',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_sales_item',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 38,
-		'in_filter': None,
-		'label': 'Is Sales Item',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01640',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'is_sales_item',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': 'No',
-		'depends_on': None,
-		'description': 'Select "Yes" if this item represents some work like training, designing, consulting etc.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_service_item',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 39,
-		'in_filter': None,
-		'label': 'Is Service Item',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01641',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'is_service_item',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': 'No',
-		'depends_on': None,
-		'description': 'Select "Yes" if this item is to be sent to a customer or received from a supplier as a sample. Delivery notes and Purchase Receipts will update stock levels but there will be no invoice against this item.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_sample_item',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 40,
-		'in_filter': None,
-		'label': 'Allow Samples',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01642',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'is_sample_item',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'max_discount',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 41,
-		'in_filter': None,
-		'label': 'Max Discount (%)',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01643',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'max_discount',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-01-17 17:34:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'default_income_account',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 42,
-		'in_filter': None,
-		'label': 'Default Income Account',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL04490',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Account',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-01-17 17:34:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'default_sales_cost_center',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 43,
-		'in_filter': None,
-		'label': 'Cost Center',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL04491',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Cost Center',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'sales_rate',
-		'fieldtype': 'Currency',
-		'hidden': 1,
-		'icon': None,
-		'idx': 44,
-		'in_filter': None,
-		'label': 'Sales Rate',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01644',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'sales_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 45,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01645',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': 'Create a price list from Price List master and enter standard ref rates against each of them. On selection of a price list in Quotation, Sales Order or Delivery Note, corresponding ref rate will be fetched for this item.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'ref_rate_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 46,
-		'in_filter': None,
-		'label': 'Ref Rate Details',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01646',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'ref_rate_details',
-		'oldfieldtype': 'Table',
-		'options': 'Ref Rate Detail',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 47,
-		'in_filter': None,
-		'label': 'Item Tax',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01647',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_tax',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 48,
-		'in_filter': None,
-		'label': 'Item Tax1',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01648',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'item_tax',
-		'oldfieldtype': 'Table',
-		'options': 'Item Tax',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 49,
-		'in_filter': None,
-		'label': 'Inspection Criteria',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01649',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': 'No',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'inspection_required',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 50,
-		'in_filter': None,
-		'label': 'Inspection Required',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01650',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'inspection_required',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_specification_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 51,
-		'in_filter': None,
-		'label': 'Item Specification Detail',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01651',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'item_specification_details',
-		'oldfieldtype': 'Table',
-		'options': 'Item Specification Detail',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 52,
-		'in_filter': None,
-		'label': 'Manufacturing',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01652',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': 'No',
-		'depends_on': None,
-		'description': 'Selecting "Yes" will allow you to create Bill of Material showing raw material and operational costs incurred to manufacture this item.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_manufactured_item',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 53,
-		'in_filter': None,
-		'label': 'Allow Bill of Materials',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01653',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'is_manufactured_item',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'default_bom',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 54,
-		'in_filter': None,
-		'label': 'Default BOM',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01654',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'default_bom',
-		'oldfieldtype': 'Link',
-		'options': 'Bill Of Materials',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': 'No',
-		'depends_on': None,
-		'description': 'Selecting "Yes" will allow you to make a Production Order for this item.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_pro_applicable',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 55,
-		'in_filter': None,
-		'label': 'Allow Production Order',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01655',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'is_pro_applicable',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:05',
-		'default': 'No',
-		'depends_on': None,
-		'description': 'Select "Yes" if you supply raw materials to your supplier to manufacture this item.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_sub_contracted_item',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 56,
-		'in_filter': None,
-		'label': 'Is Sub Contracted Item',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': 'FL01656',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'is_sub_contracted_item',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-25 16:22:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'file_list',
-		'fieldtype': 'Text',
-		'hidden': 1,
-		'icon': None,
-		'idx': 57,
-		'in_filter': None,
-		'label': 'File List',
-		'modified': '2011-04-28 09:32:17',
-		'modified_by': 'Administrator',
-		'name': '000000644',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Item',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/material_management/doctype/item_attachments_detail/item_attachments_detail.txt b/material_management/doctype/item_attachments_detail/item_attachments_detail.txt
deleted file mode 100644
index 083e892f7d..0000000000
--- a/material_management/doctype/item_attachments_detail/item_attachments_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-08-10 15:46:04', 'search_fields': None, 'module': 'Material Management', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 6, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Item Attachments Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-08-10 15:46:04', 'doctype': 'DocField', 'oldfieldname': 'file_name', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'File Name', 'width': '220px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Item Attachments Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02701', 'idx': 1, 'default': None, 'colour': None, 'modified': '2009-08-10 17:07:02', 'parenttype': 'DocType', 'fieldname': 'file_name', 'fieldtype': 'Link', 'options': 'File', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-08-10 15:46:04', 'doctype': 'DocField', 'oldfieldname': 'file_group', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'File Group', 'width': '160px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Item Attachments Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02702', 'idx': 2, 'default': None, 'colour': None, 'modified': '2009-08-10 17:07:02', 'parenttype': 'DocType', 'fieldname': 'file_group', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-08-10 15:46:04', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Description', 'width': '300px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Item Attachments Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02703', 'idx': 3, 'default': None, 'colour': None, 'modified': '2009-08-10 17:07:02', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/material_management/doctype/item_specification_detail/item_specification_detail.txt b/material_management/doctype/item_specification_detail/item_specification_detail.txt
deleted file mode 100644
index 38fdfa21db..0000000000
--- a/material_management/doctype/item_specification_detail/item_specification_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-28 13:08:08', 'search_fields': None, 'module': 'Material Management', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 1, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'IISD/.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'nabin@webnotestech.com', 'document_type': None, 'name': 'Item Specification Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-28 13:08:09', 'doctype': 'DocField', 'oldfieldname': 'specification', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 0, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Parameter', 'width': '200px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Item Specification Detail', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL01536', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-05-07 10:17:01', 'parenttype': 'DocType', 'fieldname': 'specification', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-28 13:08:09', 'doctype': 'DocField', 'oldfieldname': 'value', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Acceptance Criteria', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Item Specification Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01537', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-05-07 10:17:01', 'parenttype': 'DocType', 'fieldname': 'value', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/material_management/doctype/item_tax/item_tax.txt b/material_management/doctype/item_tax/item_tax.txt
deleted file mode 100644
index a1031d1581..0000000000
--- a/material_management/doctype/item_tax/item_tax.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-04-07 12:11:58', 'search_fields': None, 'module': 'Material Management', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': None, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Item Tax', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-04-07 12:11:58', 'doctype': 'DocField', 'oldfieldname': 'tax_type', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Tax', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Item Tax', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01724', 'idx': 1, 'default': None, 'colour': None, 'modified': '2009-04-07 12:25:25', 'parenttype': 'DocType', 'fieldname': 'tax_type', 'fieldtype': 'Link', 'options': 'Account', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-04-07 12:11:58', 'doctype': 'DocField', 'oldfieldname': 'tax_rate', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Tax Rate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Item Tax', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01725', 'idx': 2, 'default': None, 'colour': None, 'modified': '2009-04-07 12:25:25', 'parenttype': 'DocType', 'fieldname': 'tax_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/material_management/doctype/landed_cost_master/landed_cost_master.txt b/material_management/doctype/landed_cost_master/landed_cost_master.txt
deleted file mode 100644
index fb2271dc8f..0000000000
--- a/material_management/doctype/landed_cost_master/landed_cost_master.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-07-27 15:38:48', 'search_fields': None, 'module': 'Material Management', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 3, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'field:title', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Landed Cost Master', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01094', 'parent': 'Landed Cost Master', 'read': 1, 'create': None, 'creation': '2010-07-27 15:38:48', 'modified': '2010-09-20 09:46:19', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 1, 'parenttype': 'DocType', 'role': 'All', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01095', 'parent': 'Landed Cost Master', 'read': 1, 'create': 1, 'creation': '2010-07-27 15:38:48', 'modified': '2010-09-20 09:46:19', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'Purchase Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01096', 'parent': 'Landed Cost Master', 'read': 1, 'create': 1, 'creation': '2010-07-27 15:38:48', 'modified': '2010-09-20 09:46:19', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01097', 'parent': 'Landed Cost Master', 'read': 1, 'create': 1, 'creation': '2010-07-27 15:38:48', 'modified': '2010-09-20 09:46:19', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 4, 'parenttype': 'DocType', 'role': 'Purchase User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01098', 'parent': 'Landed Cost Master', 'read': 1, 'create': None, 'creation': '2010-07-27 15:38:48', 'modified': '2010-09-20 09:46:19', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 5, 'parenttype': 'DocType', 'role': 'All', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01099', 'parent': 'Landed Cost Master', 'read': 1, 'create': None, 'creation': '2010-07-27 15:38:48', 'modified': '2010-09-20 09:46:19', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 6, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01100', 'parent': 'Landed Cost Master', 'read': 1, 'create': None, 'creation': '2010-07-27 15:38:48', 'modified': '2010-09-20 09:46:19', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 7, 'parenttype': 'DocType', 'role': 'Purchase User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01101', 'parent': 'Landed Cost Master', 'read': 1, 'create': None, 'creation': '2010-07-27 15:38:48', 'modified': '2010-09-20 09:46:19', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 8, 'parenttype': 'DocType', 'role': 'Purchase Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-07-27 15:38:48', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Landed Cost Master', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05711', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 09:46:19', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-07-27 15:38:48', 'doctype': 'DocField', 'oldfieldname': 'title', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Title', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Landed Cost Master', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05713', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 09:46:19', 'parenttype': 'DocType', 'fieldname': 'title', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-07-27 15:38:48', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Landed Cost Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Landed Cost Master', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05712', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-20 09:46:19', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Table', 'creation': '2010-07-27 15:38:48', 'doctype': 'DocField', 'oldfieldname': 'landed_cost', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Landed Cost', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Landed Cost Master', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05714', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-09-20 09:46:19', 'parenttype': 'DocType', 'fieldname': 'landed_cost', 'fieldtype': 'Table', 'options': 'Landed Cost Master Detail', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/material_management/doctype/landed_cost_master_detail/landed_cost_master_detail.txt b/material_management/doctype/landed_cost_master_detail/landed_cost_master_detail.txt
deleted file mode 100644
index f72521c094..0000000000
--- a/material_management/doctype/landed_cost_master_detail/landed_cost_master_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-07-27 15:30:16', 'search_fields': None, 'module': 'Material Management', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 2, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': None, 'name': 'Landed Cost Master Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-07-27 15:30:17', 'doctype': 'DocField', 'oldfieldname': 'account_head', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Account Head', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Landed Cost Master Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05709', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-08-08 14:52:23', 'parenttype': 'DocType', 'fieldname': 'account_head', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-07-27 15:30:17', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Landed Cost Master Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05710', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-08-08 14:52:23', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/material_management/doctype/landed_cost_wizard/landed_cost_wizard.txt b/material_management/doctype/landed_cost_wizard/landed_cost_wizard.txt
deleted file mode 100644
index afbfad4a34..0000000000
--- a/material_management/doctype/landed_cost_wizard/landed_cost_wizard.txt
+++ /dev/null
@@ -1,660 +0,0 @@
-[
-	{
-		'_last_update': '1303877045',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': 1,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'module': 'Material Management',
-		'name': 'Landed Cost Wizard',
-		'name_case': None,
-		'owner': None,
-		'parent': None,
-		'parent_node': '',
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 1,
-		'smallicon': None,
-		'use_template': None,
-		'version': 33
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:07',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'name': 'PERM00306',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Landed Cost Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'All',
-		'submit': None,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 1,
-		'creation': '2010-08-08 17:09:07',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'name': 'PERM00307',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Landed Cost Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Purchase Manager',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-08-08 17:09:07',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'name': 'PERM00308',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Landed Cost Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-08-08 17:09:07',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'name': 'PERM00309',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Landed Cost Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Purchase User',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:07',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'name': 'PERM00310',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Landed Cost Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'All',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:07',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'name': 'PERM00311',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Landed Cost Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:07',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 7,
-		'match': None,
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'name': 'PERM00312',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Landed Cost Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Purchase User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:07',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 8,
-		'match': None,
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'name': 'PERM00313',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Landed Cost Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Purchase Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-27 09:34:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Landed Cost Help',
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'name': '000000649',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': '
\nThis wizard helps you add costs to your item valuation. This is useful in cases where the true item cost is know after the items have been accepted in the warehouse. For example if your freight and clearing charges are known much later, hence the term "Landed Cost" 

\nHow to use this wizard?\n
    \n
  1. Select the Purchase Receipts on whose items to want to add the costs
    2. \n
  2. Enter the costs in the second table
    3. \n
  3. Click on Update PR
    4. \n
\n
',
-		'owner': 'Administrator',
-		'parent': 'Landed Cost Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'from_pr_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'From PR Date',
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'name': 'FL01747',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Landed Cost Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'to_pr_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'To PR Date',
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'name': 'FL01748',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Landed Cost Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'currency',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Currency',
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'name': 'FL01749',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'link:Currency',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Landed Cost Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Get Purchase Receipt',
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'name': 'FL01750',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'get_purchase_receipts',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Landed Cost Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Purchase Receipts',
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'name': 'FL01751',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Simple',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Landed Cost Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': 'The landed costs will be distributed among items in these Purchase Receipts',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'lc_pr_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'LC PR Details',
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'name': 'FL01752',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'LC PR Detail',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Landed Cost Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Landed Cost Detail',
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'name': 'FL01753',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Simple',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Landed Cost Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'landed_cost',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Select Landed Cost Details Master',
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'name': 'FL01754',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Landed Cost Master',
-		'owner': 'Administrator',
-		'parent': 'Landed Cost Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Get Details',
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'name': 'FL01755',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'get_landed_cost_master_details',
-		'owner': 'Administrator',
-		'parent': 'Landed Cost Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': 'Additional costs to be loaded to item valuation',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'landed_cost_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Landed Cost Details',
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'name': 'FL01756',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Landed Cost Detail',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Landed Cost Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Update PR',
-		'modified': '2011-04-27 09:36:36',
-		'modified_by': 'Administrator',
-		'name': 'FL01757',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'update_pr_lc_se',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Landed Cost Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/material_management/doctype/purchase_receipt/purchase_receipt.txt b/material_management/doctype/purchase_receipt/purchase_receipt.txt
deleted file mode 100644
index 7a7b430599..0000000000
--- a/material_management/doctype/purchase_receipt/purchase_receipt.txt
+++ /dev/null
@@ -1,3123 +0,0 @@
-[
-	{
-		'_last_update': '1305630198',
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Transaction',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': 1,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-17 16:33:17',
-		'modified_by': 'Guest',
-		'module': 'Material Management',
-		'name': 'Purchase Receipt',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': 1,
-		'search_fields': 'status, transaction_date, supplier',
-		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': 'From %(supplier_name)s against %(purchase_order)s on %(transaction_date)s',
-		'tag_fields': None,
-		'use_template': None,
-		'version': 318
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:15',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2010-08-09 09:09:18',
-		'modified_by': 'saumil@webnotestech.com',
-		'name': 'PERM00423',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Material Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:15',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2010-08-09 09:09:18',
-		'modified_by': 'saumil@webnotestech.com',
-		'name': 'PERM00424',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Material Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:15',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2010-08-09 09:09:18',
-		'modified_by': 'saumil@webnotestech.com',
-		'name': 'PERM00425',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Material User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:15',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2010-08-09 09:09:18',
-		'modified_by': 'saumil@webnotestech.com',
-		'name': 'PERM00426',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Material User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:15',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': '',
-		'modified': '2010-08-09 09:09:18',
-		'modified_by': 'saumil@webnotestech.com',
-		'name': 'PERM00427',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Purchase User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:15',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2010-08-09 09:09:18',
-		'modified_by': 'saumil@webnotestech.com',
-		'name': 'PERM00428',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Purchase User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:15',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 7,
-		'match': 'supplier',
-		'modified': '2010-08-09 09:09:18',
-		'modified_by': 'saumil@webnotestech.com',
-		'name': 'PERM00429',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Supplier',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:15',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 8,
-		'match': None,
-		'modified': '2010-08-09 09:09:18',
-		'modified_by': 'saumil@webnotestech.com',
-		'name': 'PERM00430',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'read': 1,
-		'role': 'All',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:04',
-		'default': None,
-		'depends_on': None,
-		'description': 'Enter Basic Information about the Purchase Receipt',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Basic Info',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL05270',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL05271',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'default': 'GRN',
-		'depends_on': None,
-		'description': 'To manage multiple series please go to Setup > Manage Series',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'naming_series',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Series',
-		'modified': '2011-05-25 12:45:03',
-		'modified_by': 'Guest',
-		'name': 'FL02444',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'naming_series',
-		'oldfieldtype': 'Select',
-		'options': '\nGRN',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 0,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Supplier',
-		'modified': '2011-05-25 12:45:03',
-		'modified_by': 'Guest',
-		'name': 'FL02446',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'supplier',
-		'oldfieldtype': 'Link',
-		'options': 'Supplier',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier_address',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Supplier Address',
-		'modified': '2011-05-25 12:45:03',
-		'modified_by': 'Guest',
-		'name': 'FL02447',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_person',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Contact Person',
-		'modified': '2011-05-25 12:45:03',
-		'modified_by': 'Guest',
-		'name': 'FL02448',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Name',
-		'modified': '2011-05-25 12:45:03',
-		'modified_by': 'Guest',
-		'name': 'FL03797',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'address_display',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Address',
-		'modified': '2011-05-25 12:45:03',
-		'modified_by': 'Guest',
-		'name': 'FL05259',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_display',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Contact',
-		'modified': '2011-05-25 12:45:03',
-		'modified_by': 'Guest',
-		'name': 'FL05260',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_mobile',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Mobile No',
-		'modified': '2011-05-25 12:45:03',
-		'modified_by': 'Guest',
-		'name': 'FL05261',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_email',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Contact Email',
-		'modified': '2011-05-25 12:45:03',
-		'modified_by': 'Guest',
-		'name': 'FL05262',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Amended From',
-		'modified': '2011-05-25 12:45:03',
-		'modified_by': 'Guest',
-		'name': 'FL02450',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': 'The date at which current entry is corrected in the system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'hidden': 1,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Amendment Date',
-		'modified': '2011-05-25 12:45:03',
-		'modified_by': 'Guest',
-		'name': 'FL02451',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL05272',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': 'The date at which current entry is made in system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'transaction_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': 1,
-		'label': 'Transaction Date',
-		'modified': '2011-05-25 12:45:03',
-		'modified_by': 'Guest',
-		'name': 'FL02453',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'transaction_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': 1,
-		'label': 'Status',
-		'modified': '2011-05-25 12:45:03',
-		'modified_by': 'Guest',
-		'name': 'FL02445',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Select',
-		'options': '\nDraft\nSubmitted\nCancelled',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': '% of materials billed against this Purchase Receipt',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'per_billed',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': '% Billed',
-		'modified': '2011-05-25 12:45:03',
-		'modified_by': 'Guest',
-		'name': 'FL02454',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'per_billed',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'bill_no',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Bill No',
-		'modified': '2011-05-25 12:45:03',
-		'modified_by': 'Guest',
-		'name': 'FL02455',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'bill_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'bill_date',
-		'fieldtype': 'Date',
-		'hidden': 1,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Bill Date',
-		'modified': '2011-05-25 12:45:03',
-		'modified_by': 'Guest',
-		'name': 'FL02456',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'bill_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'range',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'Range',
-		'modified': '2011-05-25 12:45:03',
-		'modified_by': 'Guest',
-		'name': 'FL02457',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'range',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
-		'label': 'Transporter Info',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL05273',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'transporter_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
-		'label': 'Transporter Name',
-		'modified': '2011-05-25 12:45:03',
-		'modified_by': 'Guest',
-		'name': 'FL02449',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'transporter_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'sneha@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': 'Transporter lorry number',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'lr_no',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': None,
-		'label': 'LR No',
-		'modified': '2011-05-25 12:45:03',
-		'modified_by': 'Guest',
-		'name': 'FL02460',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'lr_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': 'Date on which lorry started from supplier warehouse',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'lr_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 24,
-		'in_filter': None,
-		'label': 'LR Date',
-		'modified': '2011-05-25 12:45:03',
-		'modified_by': 'Guest',
-		'name': 'FL02461',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'lr_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 25,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL05274',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'challan_no',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 26,
-		'in_filter': None,
-		'label': 'Challan No',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02462',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'challan_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'challan_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 27,
-		'in_filter': None,
-		'label': 'Challan Date',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02463',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'challan_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 28,
-		'in_filter': None,
-		'label': 'Items',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL05275',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': 'You can make a purchase receipt from multiple purchase orders. Select purchase orders one by one and click on the button below.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'purchase_order_no',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 29,
-		'in_filter': None,
-		'label': 'Purchase Order',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02466',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'purchase_order_no',
-		'oldfieldtype': 'Link',
-		'options': 'Purchase Order',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 30,
-		'in_filter': None,
-		'label': 'Pull Purchase Order Details',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02467',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'get_po_details',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': "Supplier's currency",
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'currency',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 31,
-		'in_filter': None,
-		'label': 'Currency',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02458',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'currency',
-		'oldfieldtype': 'Select',
-		'options': 'link:Currency',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': '1.00',
-		'depends_on': None,
-		'description': "Rate at which supplier's currency is converted to your currency",
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'conversion_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 32,
-		'in_filter': None,
-		'label': 'Conversion Rate',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02459',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'conversion_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 33,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL05276',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'sneha@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': 'Select "Yes" for sub - contracting items',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_subcontracted',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 34,
-		'in_filter': None,
-		'label': 'Is Subcontracted',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02465',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'is_subcontracted',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': 'Warehouse where you are maintaining stock of rejected items',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'rejected_warehouse',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 35,
-		'in_filter': None,
-		'label': 'Rejected Warehouse',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02469',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'rejected_warehouse',
-		'oldfieldtype': 'Link',
-		'options': 'Warehouse',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': 'Supplier warehouse where you have issued raw materials for sub - contracting',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier_warehouse',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 36,
-		'in_filter': None,
-		'label': 'Supplier Warehouse',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02470',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'supplier_warehouse',
-		'oldfieldtype': 'Link',
-		'options': 'Warehouse',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 37,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL05277',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
-		'owner': 'sneha@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'purchase_receipt_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 38,
-		'in_filter': None,
-		'label': 'Purchase Receipt Details',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02472',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'purchase_receipt_details',
-		'oldfieldtype': 'Table',
-		'options': 'Purchase Receipt Detail',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'net_total',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 39,
-		'in_filter': None,
-		'label': 'Net Total',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02473',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'net_total',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 40,
-		'in_filter': None,
-		'label': 'Re-Calculate Values',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02477',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:04',
-		'default': None,
-		'depends_on': None,
-		'description': 'Add / Edit taxes and other charges',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 41,
-		'in_filter': None,
-		'label': 'Taxes',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL05278',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': 'If you have created a standard template in Other Charges master, select one and click on the button below.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'purchase_other_charges',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 42,
-		'in_filter': None,
-		'label': 'Purchase Other Charges',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02479',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'purchase_other_charges',
-		'oldfieldtype': 'Link',
-		'options': 'Purchase Other Charges',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 43,
-		'in_filter': None,
-		'label': 'Get Tax Detail',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02480',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'get_purchase_tax_details',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'purchase_tax_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 44,
-		'in_filter': None,
-		'label': 'Purchase Tax Details',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02481',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'purchase_tax_details',
-		'oldfieldtype': 'Table',
-		'options': 'Purchase Tax Detail',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 45,
-		'in_filter': None,
-		'label': 'Calculate Tax',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02482',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'total_tax',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 46,
-		'in_filter': None,
-		'label': 'Total Tax',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02483',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'total_tax',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 47,
-		'in_filter': None,
-		'label': 'Tax Calculation',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL05279',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:04',
-		'default': None,
-		'depends_on': None,
-		'description': 'Add Terms and Conditions for the Purchase Receipt. You can also prepare a master Term Sheet and use the Template.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 48,
-		'in_filter': None,
-		'label': 'Terms',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL05280',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'tc_name',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 49,
-		'in_filter': None,
-		'label': 'Select Terms',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02486',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'tc_name',
-		'oldfieldtype': 'Link',
-		'options': 'Term',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 50,
-		'in_filter': None,
-		'label': 'Get Terms',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02487',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'get_tc_details',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 51,
-		'in_filter': None,
-		'label': 'Terms HTML',
-		'modified': '2011-05-25 12:45:05',
-		'modified_by': 'Guest',
-		'name': 'FL05281',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': 'You can add Terms and Notes that will be printed in the Transaction',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'terms',
-		'fieldtype': 'Text Editor',
-		'hidden': None,
-		'icon': None,
-		'idx': 52,
-		'in_filter': None,
-		'label': 'Terms1',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02489',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'terms',
-		'oldfieldtype': 'Text Editor',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:05',
-		'default': None,
-		'depends_on': None,
-		'description': 'Filing in Additional Information about the Purchase Receipt will help you analyze your data better.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 53,
-		'in_filter': None,
-		'label': 'More Info',
-		'modified': '2011-05-25 12:45:05',
-		'modified_by': 'Guest',
-		'name': 'FL05282',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': 'Select the relevant company name if you have multiple companies',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 54,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02493',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 55,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02494',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': 'The date at which current entry will get or has actually executed.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'posting_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 56,
-		'in_filter': 1,
-		'label': 'Posting Date',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02491',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'posting_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': 'Time at which materials were received',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'posting_time',
-		'fieldtype': 'Time',
-		'hidden': None,
-		'icon': None,
-		'idx': 57,
-		'in_filter': 0,
-		'label': 'Posting Time',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02492',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'posting_time',
-		'oldfieldtype': 'Time',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 0,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:48:03',
-		'default': None,
-		'depends_on': None,
-		'description': 'Track this Purchase Receipt against any Project',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'project_name',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 58,
-		'in_filter': 1,
-		'label': 'Project Name',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL03798',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'project_name',
-		'oldfieldtype': 'Link',
-		'options': 'Project',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 59,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:05',
-		'modified_by': 'Guest',
-		'name': 'FL05283',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': 1,
-		'icon': None,
-		'idx': 60,
-		'in_filter': None,
-		'label': 'Other Details',
-		'modified': '2011-05-25 12:45:05',
-		'modified_by': 'Guest',
-		'name': 'FL05284',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': "
Other Details
",
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '30%'
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'select_print_heading',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 61,
-		'in_filter': None,
-		'label': 'Select Print Heading',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02495',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'select_print_heading',
-		'oldfieldtype': 'Link',
-		'options': 'Print Heading',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'instructions',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 62,
-		'in_filter': None,
-		'label': 'Instructions',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02496',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'instructions',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'sneha@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'remarks',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 63,
-		'in_filter': None,
-		'label': 'Remarks',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02499',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'cancel_reason',
-		'fieldtype': 'Data',
-		'hidden': 0,
-		'icon': None,
-		'idx': 64,
-		'in_filter': None,
-		'label': 'Cancel Reason',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02500',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'cancel_reason',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:05',
-		'default': None,
-		'depends_on': None,
-		'description': 'Detailed Breakup of the totals',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 65,
-		'in_filter': None,
-		'label': 'Totals',
-		'modified': '2011-05-25 12:45:05',
-		'modified_by': 'Guest',
-		'name': 'FL05285',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'rounded_total',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 66,
-		'in_filter': None,
-		'label': 'Rounded Total',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02475',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'rounded_total',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'grand_total',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 67,
-		'in_filter': None,
-		'label': 'Grand Total',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02474',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'grand_total',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'other_charges_added',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 68,
-		'in_filter': None,
-		'label': 'Other Charges Added',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02502',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'other_charges_added',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'other_charges_deducted',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 69,
-		'in_filter': None,
-		'label': 'Other Charges Deducted',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02503',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'other_charges_deducted',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': 'In Words will be visible once you save the Purchase Receipt.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'in_words',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 70,
-		'in_filter': None,
-		'label': 'In Words',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02476',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'in_words',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 71,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:05',
-		'modified_by': 'Guest',
-		'name': 'FL05286',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'net_total_import',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 72,
-		'in_filter': None,
-		'label': 'Net Total (Import)',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02504',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'net_total_import',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'grand_total_import',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 73,
-		'in_filter': None,
-		'label': 'Grand Total (Import)',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02507',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'grand_total_import',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'other_charges_added_import',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 74,
-		'in_filter': None,
-		'label': 'Other Charges Added (Import)',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02505',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'other_charges_added_import',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'other_charges_deducted_import',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 75,
-		'in_filter': None,
-		'label': 'Other Charges Deducted (Import)',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02506',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'other_charges_deducted_import',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': 'In Words (Import) will be visible once you save the Purchase Receipt.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'in_words_import',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 76,
-		'in_filter': None,
-		'label': 'In Words (Import)',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02508',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'in_words_import',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:05',
-		'default': None,
-		'depends_on': None,
-		'description': 'Following table will show values if items are sub - contracted. These values will be fetched from the master of "Bill of Materials" of sub - contracted items.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 77,
-		'in_filter': None,
-		'label': 'Raw Material Details',
-		'modified': '2011-05-25 12:45:05',
-		'modified_by': 'Guest',
-		'name': 'FL05287',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 78,
-		'in_filter': None,
-		'label': 'Get Current Stock',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02510',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'get_current_stock',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'pr_raw_material_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 79,
-		'in_filter': None,
-		'label': 'PR Raw Material Details',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02511',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'pr_raw_material_details',
-		'oldfieldtype': 'Table',
-		'options': 'PR Raw Material Detail',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 80,
-		'in_filter': None,
-		'label': 'Repair Purchase Receipt',
-		'modified': '2011-05-25 12:45:04',
-		'modified_by': 'Guest',
-		'name': 'FL02515',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'repair_purchase_receipt',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Receipt',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/material_management/doctype/purchase_receipt_detail/purchase_receipt_detail.txt b/material_management/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
deleted file mode 100644
index e97bed1eec..0000000000
--- a/material_management/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-03-12 12:10:20', 'search_fields': None, 'module': 'Material Management', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 58, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': 'GRND/.#######', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'nabin@webnotestech.com', 'document_type': None, 'name': 'Purchase Receipt Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:10:20', 'doctype': 'DocField', 'oldfieldname': 'item_code', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Item Code', 'width': '100px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01273', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'item_code', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-25 17:29:00', 'doctype': 'DocField', 'oldfieldname': 'item_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 0, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Item Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL01471', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'item_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-03-12 12:10:21', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Description', 'width': '250px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01274', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:10:21', 'doctype': 'DocField', 'oldfieldname': 'received_qty', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Recd Quantity', 'width': '100px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01278', 'idx': 4, 'default': '0.00', 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'received_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:10:21', 'doctype': 'DocField', 'oldfieldname': 'qty', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Accepted Quantity', 'width': '100px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01279', 'idx': 5, 'default': '0.00', 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'qty', 'fieldtype': 'Currency', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:10:21', 'doctype': 'DocField', 'oldfieldname': 'rejected_qty', 'owner': 'Administrator', 'reqd': None, 'in_filter': 0, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Rejected Quantity', 'width': '100px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL01280', 'idx': 6, 'default': '0.00', 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'rejected_qty', 'fieldtype': 'Currency', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:10:21', 'doctype': 'DocField', 'oldfieldname': 'purchase_rate', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Rate (Default Curr.)', 'width': '100px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01281', 'idx': 7, 'default': '0.00', 'colour': 'White:FFF', 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'purchase_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:10:21', 'doctype': 'DocField', 'oldfieldname': 'uom', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'UOM', 'width': '100px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01282', 'idx': 8, 'default': None, 'colour': 'White:FFF', 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'uom', 'fieldtype': 'Link', 'options': 'UOM', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:10:21', 'doctype': 'DocField', 'oldfieldname': 'amount', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Amount (Default Curr.)', 'width': '100px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01286', 'idx': 9, 'default': '0.00', 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:10:21', 'doctype': 'DocField', 'oldfieldname': 'import_rate', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 0, 'modified_by': 'nabin@webnotestech.com', 'label': 'Rate', 'width': '100px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01287', 'idx': 10, 'default': '0.00', 'colour': 'White:FFF', 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'import_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-05-24 11:36:33', 'doctype': 'DocField', 'oldfieldname': 'import_amount', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05035', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'import_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:10:21', 'doctype': 'DocField', 'oldfieldname': 'warehouse', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 0, 'modified_by': 'nabin@webnotestech.com', 'label': 'Accepted Warehouse', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 0, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01285', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'warehouse', 'fieldtype': 'Link', 'options': 'Warehouse', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Link', 'creation': '2009-03-19 18:22:50', 'doctype': 'DocField', 'oldfieldname': 'rejected_warehouse', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Rejected Warehouse', 'width': '100px', 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01451', 'idx': 13, 'default': None, 'colour': 'White:FFF', 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'rejected_warehouse', 'fieldtype': 'Link', 'options': 'Warehouse', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-25 17:29:00', 'doctype': 'DocField', 'oldfieldname': 'brand', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Brand', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01470', 'idx': 14, 'default': None, 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'brand', 'fieldtype': 'Link', 'options': 'Brand', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-12-17 12:07:33', 'doctype': 'DocField', 'oldfieldname': 'item_group', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Item Group', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL03523', 'idx': 15, 'default': None, 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'item_group', 'fieldtype': 'Link', 'options': 'Item Group', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Date', 'creation': '2009-03-12 12:10:21', 'doctype': 'DocField', 'oldfieldname': 'schedule_date', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Schedule date', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01275', 'idx': 16, 'default': None, 'colour': 'White:FFF', 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'schedule_date', 'fieldtype': 'Date', 'options': None, 'report_hide': 0, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Text', 'creation': '2009-03-12 12:10:21', 'doctype': 'DocField', 'oldfieldname': 'serial_no', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Serial No', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01276', 'idx': 17, 'default': None, 'colour': 'White:FFF', 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'serial_no', 'fieldtype': 'Text', 'options': None, 'report_hide': 0, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-04-27 14:01:02', 'doctype': 'DocField', 'oldfieldname': 'batch_no', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Batch No', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04912', 'idx': 18, 'default': None, 'colour': 'White:FFF', 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'batch_no', 'fieldtype': 'Link', 'options': 'Batch', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Link', 'creation': '2009-04-09 13:51:06', 'doctype': 'DocField', 'oldfieldname': 'qa_no', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'QA No', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01742', 'idx': 19, 'default': None, 'colour': 'White:FFF', 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'qa_no', 'fieldtype': 'Link', 'options': 'QA Inspection Report', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:10:21', 'doctype': 'DocField', 'oldfieldname': 'conversion_factor', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Conversion Factor', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01283', 'idx': 20, 'default': None, 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'conversion_factor', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:10:21', 'doctype': 'DocField', 'oldfieldname': 'stock_uom', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Stock UOM', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01284', 'idx': 21, 'default': None, 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'stock_uom', 'fieldtype': 'Data', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-30 11:00:58', 'doctype': 'DocField', 'oldfieldname': 'stock_qty', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Stock Qty', 'width': '', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01553', 'idx': 22, 'default': None, 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'stock_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-09-21 15:01:00', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_doctype', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Prevdoc Doctype', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03054', 'idx': 23, 'default': None, 'colour': 'White:FFF', 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'prevdoc_doctype', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 0, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:10:20', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_docname', 'owner': 'Administrator', 'reqd': 0, 'in_filter': 1, 'print_hide': 0, 'modified_by': 'nabin@webnotestech.com', 'label': 'PO No', 'width': '150px', 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 1, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01272', 'idx': 24, 'default': None, 'colour': 'White:FFF', 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'prevdoc_docname', 'fieldtype': 'Link', 'options': 'Purchase Order', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-06-21 17:47:11', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_date', 'owner': 'nabin@webnotestech.com', 'reqd': None, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'PO Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05393', 'idx': 25, 'default': None, 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'prevdoc_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-09-12 19:10:05', 'doctype': 'DocField', 'oldfieldname': 'rm_supp_cost', 'owner': 'Administrator', 'reqd': None, 'in_filter': 0, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Raw Materials Supplied Cost', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 2, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02960', 'idx': 26, 'default': None, 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'rm_supp_cost', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Currency', 'creation': '2010-02-01 14:25:59', 'doctype': 'DocField', 'oldfieldname': 'item_tax_amount', 'owner': 'wasim@webnotestech.com', 'reqd': 0, 'in_filter': None, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Item Tax Amount', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL03908', 'idx': 27, 'default': None, 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'item_tax_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 0, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:10:21', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_detail_docname', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'PO Detail No', 'width': '150px', 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01288', 'idx': 28, 'default': None, 'colour': 'White:FFF', 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'prevdoc_detail_docname', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:10:21', 'doctype': 'DocField', 'oldfieldname': 'billed_qty', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Billed Quantity', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01289', 'idx': 29, 'default': '0.00', 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'billed_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Currency', 'creation': '2009-04-08 15:48:00', 'doctype': 'DocField', 'oldfieldname': 'valuation_rate', 'owner': 'Administrator', 'reqd': None, 'in_filter': 0, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Valuation Rate', 'width': '80px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01731', 'idx': 30, 'default': None, 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'valuation_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-01-29 12:14:26', 'doctype': 'DocField', 'oldfieldname': 'item_tax_rate', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': 0, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Item Tax Rate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': 'Tax detail table fetched from item master as a string and stored in this field.\nUsed for Purchase Other Charges', 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03894', 'idx': 31, 'default': None, 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'item_tax_rate', 'fieldtype': 'Small Text', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Check', 'creation': '2009-09-03 15:06:01', 'doctype': 'DocField', 'oldfieldname': 'page_break', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'nabin@webnotestech.com', 'label': 'Page Break', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Receipt Detail', 'search_index': None, 'allow_on_submit': 1, 'icon': None, 'name': 'FL02915', 'idx': 32, 'default': None, 'colour': None, 'modified': '2010-06-21 17:47:42', 'parenttype': 'DocType', 'fieldname': 'page_break', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/material_management/doctype/ref_rate_detail/ref_rate_detail.txt b/material_management/doctype/ref_rate_detail/ref_rate_detail.txt
deleted file mode 100644
index 06edea0f69..0000000000
--- a/material_management/doctype/ref_rate_detail/ref_rate_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-03-26 15:17:43', 'search_fields': None, 'module': 'Material Management', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 1, 'read_only': 0, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 2, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'RFD/.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Ref Rate Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-03-26 15:17:43', 'doctype': 'DocField', 'oldfieldname': 'price_list_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Price List Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Ref Rate Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01475', 'idx': 1, 'default': '', 'colour': None, 'modified': '2010-03-31 10:16:36', 'parenttype': 'DocType', 'fieldname': 'price_list_name', 'fieldtype': 'Select', 'options': 'link:Price List', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-26 15:17:43', 'doctype': 'DocField', 'oldfieldname': 'ref_rate', 'owner': 'Administrator', 'reqd': 0, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Ref Rate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Ref Rate Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01476', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-03-31 10:16:36', 'parenttype': 'DocType', 'fieldname': 'ref_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-04-16 12:40:05', 'doctype': 'DocField', 'oldfieldname': 'ref_currency', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Currency', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Ref Rate Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01916', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-03-31 10:16:36', 'parenttype': 'DocType', 'fieldname': 'ref_currency', 'fieldtype': 'Select', 'options': 'link:Currency', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/material_management/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.txt b/material_management/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.txt
deleted file mode 100644
index b6f426bc85..0000000000
--- a/material_management/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.txt
+++ /dev/null
@@ -1,1005 +0,0 @@
-[
-	{
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:21',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': 0,
-		'issingle': 1,
-		'istable': 0,
-		'max_attachments': None,
-		'menu_index': 1,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'module': 'Material Management',
-		'name': 'Sales and Purchase Return Wizard',
-		'name_case': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': None,
-		'parent_node': 'Materials',
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 1,
-		'smallicon': None,
-		'use_template': None,
-		'version': 64
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 1,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'PERM00468',
-		'owner': 'Administrator',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Material User',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'PERM00469',
-		'owner': 'Administrator',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Material User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 1,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'PERM00470',
-		'owner': 'Administrator',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Material Manager',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'PERM00471',
-		'owner': 'Administrator',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Material Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'PERM00472',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'All',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 1,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'PERM00473',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 7,
-		'match': None,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'PERM00474',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Accounts Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 8,
-		'match': None,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'PERM00475',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Accounts User',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 9,
-		'match': None,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'PERM00476',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 10,
-		'match': None,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'PERM00477',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 11,
-		'match': None,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'PERM00478',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Purchase User',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 12,
-		'match': None,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'PERM00479',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Purchase Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 13,
-		'match': None,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'PERM00480',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'All',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 14,
-		'match': None,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'PERM00481',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 15,
-		'match': None,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'PERM00482',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Accounts Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 16,
-		'match': None,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'PERM00483',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Accounts User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 17,
-		'match': None,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'PERM00484',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 18,
-		'match': None,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'PERM00485',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 19,
-		'match': None,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'PERM00486',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Purchase User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 20,
-		'match': None,
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'PERM00487',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Purchase Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'return_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Return Date',
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'FL02979',
-		'no_copy': 1,
-		'oldfieldname': 'return_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'return_type',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Return Type',
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'FL02980',
-		'no_copy': 1,
-		'oldfieldname': 'return_type',
-		'oldfieldtype': 'Select',
-		'options': '\nSales Return\nPurchase Return',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'delivery_note_no',
-		'fieldtype': 'Link',
-		'hidden': 1,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Delivery Note No',
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'FL02981',
-		'no_copy': 1,
-		'oldfieldname': 'delivery_note_no',
-		'oldfieldtype': 'Link',
-		'options': 'Delivery Note',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-01-30 14:43:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'sales_invoice_no',
-		'fieldtype': 'Link',
-		'hidden': 1,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Sales Invoice No',
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'FL04423',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Receivable Voucher',
-		'owner': 'Administrator',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'purchase_receipt_no',
-		'fieldtype': 'Link',
-		'hidden': 1,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Purchase Receipt No',
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'FL02982',
-		'no_copy': 1,
-		'oldfieldname': 'purchase_receipt_no',
-		'oldfieldtype': 'Link',
-		'options': 'Purchase Receipt',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-01-25 13:45:49',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'cust_supp',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Customer/Supplier',
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'FL04418',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-01-25 13:53:27',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'cust_supp_name',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Cust/Supp Name',
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'FL04419',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-01-25 13:53:27',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'cust_supp_address',
-		'fieldtype': 'Small Text',
-		'hidden': 1,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Cust/Supp Address',
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'FL04420',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': 1,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Get Items',
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'FL02983',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'return_details',
-		'fieldtype': 'Table',
-		'hidden': 1,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Return Details',
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'FL02984',
-		'no_copy': 1,
-		'oldfieldname': 'return_details',
-		'oldfieldtype': 'Table',
-		'options': 'Return Detail',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': 1,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Make Stock Entry',
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'FL02985',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': 1,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Make Excise Invoice',
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'FL02986',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': 1,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Make Credit Note',
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'FL02987',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': 1,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Make Debit Note',
-		'modified': '2011-02-23 19:09:18',
-		'modified_by': 'Administrator',
-		'name': 'FL02988',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales and Purchase Return Wizard',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/material_management/doctype/sales_bom/sales_bom.txt b/material_management/doctype/sales_bom/sales_bom.txt
deleted file mode 100644
index c7a31dede9..0000000000
--- a/material_management/doctype/sales_bom/sales_bom.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-28 10:22:45', 'search_fields': None, 'module': 'Material Management', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 40, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': 1, 'allow_print': None, 'autoname': '', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': 'Master', 'name': 'Sales BOM', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-10-11 14:28:31', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00888', 'parent': 'Sales BOM', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:50:52', 'modified': '2010-10-11 14:28:31', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 1, 'parenttype': 'DocType', 'role': 'Material Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': 1, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00889', 'parent': 'Sales BOM', 'read': 1, 'create': 1, 'creation': '2010-04-26 16:50:52', 'modified': '2010-10-11 14:28:31', 'submit': 1, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'Material Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00913', 'parent': 'Sales BOM', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:53:11', 'modified': '2010-10-11 14:28:31', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 3, 'parenttype': 'DocType', 'role': 'Material User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00914', 'parent': 'Sales BOM', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:53:11', 'modified': '2010-10-11 14:28:31', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 4, 'parenttype': 'DocType', 'role': 'Material User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': 0, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00263', 'parent': 'Sales BOM', 'read': 1, 'create': 1, 'creation': '2009-03-28 10:22:45', 'modified': '2010-10-11 14:28:31', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 5, 'parenttype': 'DocType', 'role': 'Sales User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00269', 'parent': 'Sales BOM', 'read': 1, 'create': 0, 'creation': '2009-04-02 10:51:59', 'modified': '2010-10-11 14:28:31', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 6, 'parenttype': 'DocType', 'role': 'Sales User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Sales BOM', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04858', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-10-11 14:28:31', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2009-03-28 10:22:45', 'doctype': 'DocField', 'oldfieldname': 'new_item_code', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'New Item Code', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Sales BOM', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01490', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-10-11 14:28:31', 'parenttype': 'DocType', 'fieldname': 'new_item_code', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-28 14:12:17', 'doctype': 'DocField', 'oldfieldname': 'new_item_name', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'New Item Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Sales BOM', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01541', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-10-11 14:28:31', 'parenttype': 'DocType', 'fieldname': 'new_item_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-28 14:12:17', 'doctype': 'DocField', 'oldfieldname': 'new_item_brand', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'New Item Brand', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Sales BOM', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01540', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-10-11 14:28:31', 'parenttype': 'DocType', 'fieldname': 'new_item_brand', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-03-28 11:53:18', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'New Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Sales BOM', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01496', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-10-11 14:28:31', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-30 15:34:20', 'doctype': 'DocField', 'oldfieldname': 'stock_uom', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Stock UOM', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Sales BOM', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01563', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-10-11 14:28:31', 'parenttype': 'DocType', 'fieldname': 'stock_uom', 'fieldtype': 'Link', 'options': 'UOM', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-30 15:34:20', 'doctype': 'DocField', 'oldfieldname': 'item_group', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Item Group', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Sales BOM', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01564', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-10-11 14:28:31', 'parenttype': 'DocType', 'fieldname': 'item_group', 'fieldtype': 'Link', 'options': 'Item Group', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-04-02 10:41:37', 'doctype': 'DocField', 'oldfieldname': 'price_list', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Price List', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Sales BOM', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01607', 'idx': 8, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-11 14:28:31', 'parenttype': 'DocType', 'fieldname': 'price_list', 'fieldtype': 'Select', 'options': 'link:Price List', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-05-18 16:57:53', 'doctype': 'DocField', 'oldfieldname': 'currency', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Currency', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Sales BOM', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02086', 'idx': 9, 'default': '', 'colour': 'White:FFF', 'modified': '2010-10-11 14:28:31', 'parenttype': 'DocType', 'fieldname': 'currency', 'fieldtype': 'Select', 'options': 'link:Currency', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2010-05-07 16:37:53', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Find Sales BOM', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Sales BOM', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04989', 'idx': 10, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-11 14:28:31', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Table', 'creation': '2009-03-28 10:22:45', 'doctype': 'DocField', 'oldfieldname': 'sales_bom_items', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Sales BOM Items', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Sales BOM', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01488', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-10-11 14:28:31', 'parenttype': 'DocType', 'fieldname': 'sales_bom_items', 'fieldtype': 'Table', 'options': 'Sales BOM Detail', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/material_management/doctype/sales_bom_detail/sales_bom_detail.txt b/material_management/doctype/sales_bom_detail/sales_bom_detail.txt
deleted file mode 100644
index fc88802d01..0000000000
--- a/material_management/doctype/sales_bom_detail/sales_bom_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-03-28 10:26:00', 'search_fields': None, 'module': 'Material Management', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 3, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': '', 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Sales BOM Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-04-13 11:07:04', 'doctype': 'DocField', 'oldfieldname': 'is_main_item', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Is Main Item', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Sales BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01783', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-07-13 14:11:40', 'parenttype': 'DocType', 'fieldname': 'is_main_item', 'fieldtype': 'Select', 'options': '\nYes\nNo', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-28 10:26:00', 'doctype': 'DocField', 'oldfieldname': 'item_code', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Item', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Sales BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01491', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-07-13 14:11:40', 'parenttype': 'DocType', 'fieldname': 'item_code', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-03-28 10:26:00', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Description', 'width': '200px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Sales BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01492', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-07-13 14:11:40', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-09-18 17:28:03', 'doctype': 'DocField', 'oldfieldname': 'uom', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'UOM', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Sales BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03047', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-07-13 14:11:40', 'parenttype': 'DocType', 'fieldname': 'uom', 'fieldtype': 'Link', 'options': 'UOM', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-28 10:26:00', 'doctype': 'DocField', 'oldfieldname': 'qty', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Qty', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Sales BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01493', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-07-13 14:11:40', 'parenttype': 'DocType', 'fieldname': 'qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-04-02 10:40:17', 'doctype': 'DocField', 'oldfieldname': 'rate', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Rate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Sales BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01605', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-07-13 14:11:40', 'parenttype': 'DocType', 'fieldname': 'rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/material_management/doctype/serial_no/serial_no.txt b/material_management/doctype/serial_no/serial_no.txt
deleted file mode 100644
index 53e8f199d8..0000000000
--- a/material_management/doctype/serial_no/serial_no.txt
+++ /dev/null
@@ -1,1935 +0,0 @@
-[
-	{
-		'_last_update': '1305616095',
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': 1,
-		'autoname': 'field:serial_no',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:23',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-17 12:38:15',
-		'modified_by': 'Guest',
-		'module': 'Material Management',
-		'name': 'Serial No',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'item_code,status',
-		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': '%(item_code)s',
-		'tag_fields': 'status',
-		'use_template': None,
-		'version': 188
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:23',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2010-08-08 17:09:23',
-		'modified_by': 'Administrator',
-		'name': 'PERM00518',
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Material Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:23',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2010-08-08 17:09:23',
-		'modified_by': 'Administrator',
-		'name': 'PERM00519',
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Material Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:23',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2010-08-08 17:09:23',
-		'modified_by': 'Administrator',
-		'name': 'PERM00520',
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Material User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:23',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2010-08-08 17:09:23',
-		'modified_by': 'Administrator',
-		'name': 'PERM00521',
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Material User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': None,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:23',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2010-08-08 17:09:23',
-		'modified_by': 'Administrator',
-		'name': 'PERM00522',
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:23',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2010-08-08 17:09:23',
-		'modified_by': 'Administrator',
-		'name': 'PERM00523',
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Material Master Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:23',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 7,
-		'match': None,
-		'modified': '2010-08-08 17:09:23',
-		'modified_by': 'Administrator',
-		'name': 'PERM00524',
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:23',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 8,
-		'match': None,
-		'modified': '2010-08-08 17:09:23',
-		'modified_by': 'Administrator',
-		'name': 'PERM00525',
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales Master Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Details',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL05450',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL05451',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:23',
-		'default': 'In Store',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 1,
-		'label': 'Status',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL03193',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Select',
-		'options': '\nIn Store\nDelivered\nNot in Use',
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'serial_no',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 0,
-		'label': 'Serial No',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL03181',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'serial_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_code',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': 1,
-		'label': 'Item Code',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL03182',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'item_code',
-		'oldfieldtype': 'Link',
-		'options': 'Item',
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 0,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL05452',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-25 15:45:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Item Name',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': '000002038',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': 1,
-		'label': 'Description',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL03185',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'description',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': '300px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_group',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': 0,
-		'label': 'Item Group',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL03183',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'item_group',
-		'oldfieldtype': 'Link',
-		'options': 'Item Group',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'brand',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': 0,
-		'label': 'Brand',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL03184',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'brand',
-		'oldfieldtype': 'Link',
-		'options': 'Brand',
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Purchase Details',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL05453',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL05454',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-25 15:45:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'purchase_document_type',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Purchase Document Type',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': '000002040',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': '\nPurchase Receipt\nStock Entry',
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-25 15:45:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'purchase_document_no',
-		'fieldtype': 'Data',
-		'hidden': 0,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Purchase Document No',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': '000002041',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'purchase_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': 1,
-		'label': 'Purchase Date',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL03187',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'purchase_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 0,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-25 15:45:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'purchase_time',
-		'fieldtype': 'Time',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': 'Incoming Time',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': '000002042',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'purchase_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': 0,
-		'label': 'Incoming Rate',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL03188',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'purchase_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL05455',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'warehouse',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': 1,
-		'label': 'Warehouse',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL03195',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'warehouse',
-		'oldfieldtype': 'Link',
-		'options': 'Warehouse',
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-25 15:45:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': 1,
-		'label': 'Supplier',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': '000002043',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Supplier',
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-25 15:45:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': 1,
-		'label': 'Supplier Name',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': '000002044',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'address_display',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
-		'label': 'Supplier Address',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL05445',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': None,
-		'label': 'Delivery Details',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL05456',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 24,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL05457',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-25 15:45:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'delivery_document_type',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 25,
-		'in_filter': 1,
-		'label': 'Delivery Document Type',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': '000002047',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': '\nDelivery Note\nReceivable Voucher\nStock Entry',
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-25 15:45:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'delivery_document_no',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 26,
-		'in_filter': 1,
-		'label': 'Delivery Document No',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': '000002048',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_address',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 27,
-		'in_filter': None,
-		'label': 'Customer Address',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL03201',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer_address',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'delivery_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 28,
-		'in_filter': None,
-		'label': 'Delivery Date',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL03199',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'delivery_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-25 15:45:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'delivery_time',
-		'fieldtype': 'Time',
-		'hidden': None,
-		'icon': None,
-		'idx': 29,
-		'in_filter': None,
-		'label': 'Delivery Time',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': '000002049',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_cancelled',
-		'fieldtype': 'Select',
-		'hidden': 1,
-		'icon': None,
-		'idx': 30,
-		'in_filter': None,
-		'label': 'Is Cancelled',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL03203',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'is_cancelled',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 31,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL05458',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 32,
-		'in_filter': 1,
-		'label': 'Customer',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL03799',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'customer',
-		'oldfieldtype': 'Link',
-		'options': 'Customer',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 33,
-		'in_filter': 1,
-		'label': 'Customer Name',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL03200',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'customer_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-25 15:45:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'delivery_address',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 34,
-		'in_filter': None,
-		'label': 'Delivery Address',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': '000002050',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'territory',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 35,
-		'in_filter': 1,
-		'label': 'Territory',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL03202',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'territory',
-		'oldfieldtype': 'Link',
-		'options': 'Territory',
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': 0,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 36,
-		'in_filter': None,
-		'label': 'Warranty / AMC Details',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL05459',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 37,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL05460',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'maintenance_status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 38,
-		'in_filter': 1,
-		'label': 'Maintenance Status',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL03194',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'maintenance_status',
-		'oldfieldtype': 'Select',
-		'options': '\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC',
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'warranty_period',
-		'fieldtype': 'Int',
-		'hidden': None,
-		'icon': None,
-		'idx': 39,
-		'in_filter': None,
-		'label': 'Warranty Period (Days)',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL03189',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'warranty_period',
-		'oldfieldtype': 'Int',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 40,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL05461',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'warranty_expiry_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 41,
-		'in_filter': 1,
-		'label': 'Warranty Expiry Date',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL03190',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'warranty_expiry_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amc_expiry_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 42,
-		'in_filter': 1,
-		'label': 'AMC Expiry Date',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL03191',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'amc_expiry_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 43,
-		'in_filter': None,
-		'label': 'More Info',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL05462',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-25 15:45:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'serial_no_details',
-		'fieldtype': 'Text Editor',
-		'hidden': None,
-		'icon': None,
-		'idx': 44,
-		'in_filter': None,
-		'label': 'Serial No Details',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': '000002053',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-26 17:02:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 45,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': '000002814',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'link:Company',
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-26 17:02:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 46,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': '000002815',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'link:Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'trash_reason',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 47,
-		'in_filter': None,
-		'label': 'Trash Reason',
-		'modified': '2011-05-25 12:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL03207',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'trash_reason',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Serial No',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/material_management/doctype/stock_entry/stock_entry.txt b/material_management/doctype/stock_entry/stock_entry.txt
deleted file mode 100644
index 448693c7a8..0000000000
--- a/material_management/doctype/stock_entry/stock_entry.txt
+++ /dev/null
@@ -1,1800 +0,0 @@
-[
-	{
-		'_last_update': '1308034183',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:25',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'module': 'Material Management',
-		'name': 'Stock Entry',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': 'No',
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'transfer_date, from_warehouse, to_warehouse, purpose, remarks',
-		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': '%(remarks)s',
-		'tag_fields': 'purpose',
-		'use_template': None,
-		'version': 243
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:25',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'PERM00541',
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Material Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:25',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'PERM00542',
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Material Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:25',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'PERM00543',
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Material User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:25',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'PERM00544',
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Material User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:25',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'PERM00545',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Production User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:25',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'PERM00546',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Production User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 0,
-		'creation': '2010-08-08 17:09:25',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 7,
-		'match': None,
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'PERM00547',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'read': 1,
-		'role': 'Production User',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:25',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 8,
-		'match': None,
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'PERM00548',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Production Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:25',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 9,
-		'match': None,
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'PERM00549',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Production Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:25',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 10,
-		'match': None,
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'PERM00550',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'read': 1,
-		'role': 'Production Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Warehouse',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03366',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03367',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': 'To manage multiple series please go to Setup > Manage Series',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'naming_series',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Series',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03368',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'naming_series',
-		'oldfieldtype': 'Select',
-		'options': 'STE',
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': 'The date at which current entry is corrected in the system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Amendment Date',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03369',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'purpose',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': 1,
-		'label': 'Purpose',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03370',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'purpose',
-		'oldfieldtype': 'Select',
-		'options': 'Material Issue\nMaterial Receipt\nMaterial Transfer\nSales Return\nPurchase Return\nSubcontracting\nProduction Order',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'delivery_note_no',
-		'fieldtype': 'Link',
-		'hidden': 1,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Delivery Note No',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03371',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'delivery_note_no',
-		'oldfieldtype': 'Link',
-		'options': 'Delivery Note',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'purchase_receipt_no',
-		'fieldtype': 'Link',
-		'hidden': 1,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Purchase Receipt No',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03372',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'purchase_receipt_no',
-		'oldfieldtype': 'Link',
-		'options': 'Purchase Receipt',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-01 14:10:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'sales_invoice_no',
-		'fieldtype': 'Link',
-		'hidden': 1,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Sales Invoice No',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL04464',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Receivable Voucher',
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier',
-		'fieldtype': 'Link',
-		'hidden': 1,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Supplier',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03373',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'supplier',
-		'oldfieldtype': 'Link',
-		'options': 'Supplier',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Supplier Name',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03800',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'supplier_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier_address',
-		'fieldtype': 'Small Text',
-		'hidden': 1,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Supplier Address',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03374',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'supplier_address',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'hidden': 1,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Customer',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03375',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer',
-		'oldfieldtype': 'Link',
-		'options': 'Customer',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_name',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Customer Name',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03801',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_address',
-		'fieldtype': 'Small Text',
-		'hidden': 1,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Customer Address',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03376',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer_address',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'process',
-		'fieldtype': 'Select',
-		'hidden': 1,
-		'icon': None,
-		'idx': 15,
-		'in_filter': 1,
-		'label': 'Process',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03377',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'process',
-		'oldfieldtype': 'Select',
-		'options': '\nMaterial Transfer\nBackflush',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'production_order',
-		'fieldtype': 'Link',
-		'hidden': 1,
-		'icon': None,
-		'idx': 16,
-		'in_filter': 1,
-		'label': 'Production Order',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03378',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'production_order',
-		'oldfieldtype': 'Link',
-		'options': 'Production Order',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fg_completed_qty',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'FG Completed Qty',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03379',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'fg_completed_qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Warehouse HTML',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03380',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': "
Warehouse
",
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'from_warehouse',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Source Warehouse',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03381',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'from_warehouse',
-		'oldfieldtype': 'Link',
-		'options': 'Warehouse',
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': 'Notes: Either Source or Target is Mandatory',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'to_warehouse',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': 0,
-		'label': 'Target Warehouse',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03382',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'to_warehouse',
-		'oldfieldtype': 'Link',
-		'options': 'Warehouse',
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03383',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': 'Today',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'transfer_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': 1,
-		'label': 'Transfer Date',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03384',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'transfer_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': 'The date at which current entry will get or has actually executed.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'posting_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': 1,
-		'label': 'Posting Date',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03385',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'posting_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'posting_time',
-		'fieldtype': 'Time',
-		'hidden': None,
-		'icon': None,
-		'idx': 24,
-		'in_filter': 0,
-		'label': 'Posting Time',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03386',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'posting_time',
-		'oldfieldtype': 'Time',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 25,
-		'in_filter': None,
-		'label': 'Amended From',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03387',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Link',
-		'options': 'Stock Entry',
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'transporter',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 26,
-		'in_filter': None,
-		'label': 'Transporter',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03388',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'transporter',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_excisable_goods',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 27,
-		'in_filter': None,
-		'label': 'Is Excisable Goods',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03389',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'is_excisable_goods',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'excisable_goods',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 28,
-		'in_filter': None,
-		'label': 'Excisable Goods',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03390',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'excisable_goods',
-		'oldfieldtype': 'Select',
-		'options': '\nReturnable\nNon-Returnable',
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'under_rule',
-		'fieldtype': 'Select',
-		'hidden': 1,
-		'icon': None,
-		'idx': 29,
-		'in_filter': None,
-		'label': 'Under Rule',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03391',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'under_rule',
-		'oldfieldtype': 'Select',
-		'options': '\nOrdinary\n57 AC (5) a\n57 F (2) Non-Exc.',
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'remarks',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 30,
-		'in_filter': None,
-		'label': 'Remarks',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03392',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'remarks',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'cancel_reason',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 31,
-		'in_filter': 0,
-		'label': 'Cancel Reason',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03393',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'cancel_reason',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 32,
-		'in_filter': None,
-		'label': 'Items',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03394',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 33,
-		'in_filter': None,
-		'label': 'Get Stock and Rate',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03395',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'get_stock_and_rate',
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 34,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03396',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': 0,
-		'icon': None,
-		'idx': 35,
-		'in_filter': None,
-		'label': 'Get Items',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03397',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'get_items',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 36,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03398',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'mtn_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 37,
-		'in_filter': None,
-		'label': 'MTN Details',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03399',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'mtn_details',
-		'oldfieldtype': 'Table',
-		'options': 'Stock Entry Detail',
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'total_amount',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 38,
-		'in_filter': None,
-		'label': 'Total Amount',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03400',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'total_amount',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 39,
-		'in_filter': None,
-		'label': 'Other Details',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03401',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 40,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03402',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 41,
-		'in_filter': 0,
-		'label': 'Fiscal Year',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03403',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-19 11:08:49',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'select_print_heading',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 42,
-		'in_filter': None,
-		'label': 'Select Print Heading',
-		'modified': '2011-06-14 12:50:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03766',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'select_print_heading',
-		'oldfieldtype': 'Link',
-		'options': 'Print Heading',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Stock Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/material_management/doctype/stock_entry_detail/stock_entry_detail.txt b/material_management/doctype/stock_entry_detail/stock_entry_detail.txt
deleted file mode 100644
index 509332dbe5..0000000000
--- a/material_management/doctype/stock_entry_detail/stock_entry_detail.txt
+++ /dev/null
@@ -1,651 +0,0 @@
-[
-	{
-		'_last_update': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'MTND/.######',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:25',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': 1,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-04-26 11:47:18',
-		'modified_by': 'Administrator',
-		'module': 'Material Management',
-		'name': 'Stock Entry Detail',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Tray',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 24
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 's_warehouse',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': 1,
-		'label': 'Source Warehouse',
-		'modified': '2011-04-26 11:47:18',
-		'modified_by': 'Administrator',
-		'name': 'FL03404',
-		'no_copy': None,
-		'oldfieldname': 's_warehouse',
-		'oldfieldtype': 'Link',
-		'options': 'Warehouse',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Stock Entry Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 't_warehouse',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': 1,
-		'label': 'Target Warehouse',
-		'modified': '2011-04-26 11:47:18',
-		'modified_by': 'Administrator',
-		'name': 'FL03405',
-		'no_copy': None,
-		'oldfieldname': 't_warehouse',
-		'oldfieldtype': 'Link',
-		'options': 'Warehouse',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Stock Entry Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fg_item',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 1,
-		'label': 'FG Item',
-		'modified': '2011-04-26 11:47:18',
-		'modified_by': 'Administrator',
-		'name': 'FL03406',
-		'no_copy': None,
-		'oldfieldname': 'fg_item',
-		'oldfieldtype': 'Check',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Stock Entry Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_code',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Item Code',
-		'modified': '2011-04-26 11:47:18',
-		'modified_by': 'Administrator',
-		'name': 'FL03407',
-		'no_copy': None,
-		'oldfieldname': 'item_code',
-		'oldfieldtype': 'Link',
-		'options': 'Item',
-		'owner': 'Administrator',
-		'parent': 'Stock Entry Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-26 11:47:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': 1,
-		'label': 'Item Name',
-		'modified': '2011-04-26 11:47:18',
-		'modified_by': 'Administrator',
-		'name': '000002665',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Entry Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Description',
-		'modified': '2011-04-26 11:47:18',
-		'modified_by': 'Administrator',
-		'name': 'FL03408',
-		'no_copy': None,
-		'oldfieldname': 'description',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Entry Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '300px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'batch_no',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Batch No',
-		'modified': '2011-04-26 11:47:18',
-		'modified_by': 'Administrator',
-		'name': 'FL03409',
-		'no_copy': None,
-		'oldfieldname': 'batch_no',
-		'oldfieldtype': 'Link',
-		'options': 'Batch',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Stock Entry Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'actual_qty',
-		'fieldtype': 'Read Only',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': 1,
-		'label': 'Actual Qty (at source)',
-		'modified': '2011-04-26 11:47:18',
-		'modified_by': 'Administrator',
-		'name': 'FL03410',
-		'no_copy': 1,
-		'oldfieldname': 'actual_qty',
-		'oldfieldtype': 'Read Only',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Entry Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:23:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'qty',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Qty',
-		'modified': '2011-04-26 11:47:18',
-		'modified_by': 'Administrator',
-		'name': 'FL04245',
-		'no_copy': None,
-		'oldfieldname': 'qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Stock Entry Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'reqd_qty',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': 0,
-		'label': 'Reqd Qty',
-		'modified': '2011-04-26 11:47:18',
-		'modified_by': 'Administrator',
-		'name': 'FL03412',
-		'no_copy': None,
-		'oldfieldname': 'reqd_qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Stock Entry Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 3,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-12-14 16:34:12',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'uom',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'UOM',
-		'modified': '2011-04-26 11:47:18',
-		'modified_by': 'Administrator',
-		'name': 'FL04299',
-		'no_copy': None,
-		'oldfieldname': 'uom',
-		'oldfieldtype': 'Link',
-		'options': 'UOM',
-		'owner': 'Administrator',
-		'parent': 'Stock Entry Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:23:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'conversion_factor',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Conversion Factor',
-		'modified': '2011-04-26 11:47:18',
-		'modified_by': 'Administrator',
-		'name': 'FL04246',
-		'no_copy': None,
-		'oldfieldname': 'conversion_factor',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Stock Entry Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'stock_uom',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': 0,
-		'label': 'Stock UOM',
-		'modified': '2011-04-26 11:47:18',
-		'modified_by': 'Administrator',
-		'name': 'FL03411',
-		'no_copy': None,
-		'oldfieldname': 'stock_uom',
-		'oldfieldtype': 'Link',
-		'options': 'UOM',
-		'owner': 'Administrator',
-		'parent': 'Stock Entry Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'transfer_qty',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Stock Qty',
-		'modified': '2011-04-26 11:47:18',
-		'modified_by': 'Administrator',
-		'name': 'FL03413',
-		'no_copy': None,
-		'oldfieldname': 'transfer_qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Entry Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'serial_no',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Serial No',
-		'modified': '2011-04-26 11:47:18',
-		'modified_by': 'Administrator',
-		'name': 'FL03414',
-		'no_copy': None,
-		'oldfieldname': 'serial_no',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Entry Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'incoming_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': 'Incoming Rate',
-		'modified': '2011-04-26 11:47:18',
-		'modified_by': 'Administrator',
-		'name': 'FL03415',
-		'no_copy': None,
-		'oldfieldname': 'incoming_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Entry Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amount',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Amount',
-		'modified': '2011-04-26 11:47:18',
-		'modified_by': 'Administrator',
-		'name': 'FL03416',
-		'no_copy': None,
-		'oldfieldname': 'amount',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Entry Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/material_management/doctype/stock_ledger/stock_ledger.txt b/material_management/doctype/stock_ledger/stock_ledger.txt
deleted file mode 100644
index 6302b49dbb..0000000000
--- a/material_management/doctype/stock_ledger/stock_ledger.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-12 12:09:43', 'search_fields': None, 'module': 'Material Management', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 1, 'read_only': 1, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 10, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'nabin@webnotestech.com', 'document_type': None, 'name': 'Stock Ledger', 'idx': None, 'hide_toolbar': 1, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM00198', 'parent': 'Stock Ledger', 'read': 1, 'create': None, 'creation': '2009-03-12 14:53:41', 'modified': '2010-08-07 01:10:02', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 1, 'parenttype': 'DocType', 'role': 'All', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM00206', 'parent': 'Stock Ledger', 'read': 1, 'create': None, 'creation': '2009-03-12 15:09:54', 'modified': '2010-08-07 01:10:02', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'Material User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}]
\ No newline at end of file
diff --git a/material_management/doctype/stock_ledger_entry/stock_ledger_entry.txt b/material_management/doctype/stock_ledger_entry/stock_ledger_entry.txt
deleted file mode 100644
index de6847ecdc..0000000000
--- a/material_management/doctype/stock_ledger_entry/stock_ledger_entry.txt
+++ /dev/null
@@ -1,1013 +0,0 @@
-[
-	{
-		'_last_update': '1304945576',
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'SLE/.########',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:25',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': 1,
-		'idx': None,
-		'in_create': 1,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-09 18:23:41',
-		'modified_by': 'Administrator',
-		'module': 'Material Management',
-		'name': 'Stock Ledger Entry',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 54
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:25',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-05-09 18:23:41',
-		'modified_by': 'Administrator',
-		'name': 'PERM00553',
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Material User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:25',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-05-09 18:23:41',
-		'modified_by': 'Administrator',
-		'name': 'PERM00554',
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'All',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:25',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-05-09 18:23:41',
-		'modified_by': 'Administrator',
-		'name': 'PERM00555',
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Material User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:25',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2011-05-09 18:23:41',
-		'modified_by': 'Administrator',
-		'name': 'PERM00556',
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_code',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': 1,
-		'label': 'Item Code',
-		'modified': '2011-05-09 18:23:41',
-		'modified_by': 'Administrator',
-		'name': 'FL03417',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'item_code',
-		'oldfieldtype': 'Link',
-		'options': 'Item',
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-27 13:05:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'serial_no',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': 1,
-		'label': 'Serial No',
-		'modified': '2011-05-09 18:23:41',
-		'modified_by': 'Administrator',
-		'name': '000000675',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Serial No',
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'batch_no',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Batch No',
-		'modified': '2011-05-09 18:23:41',
-		'modified_by': 'Administrator',
-		'name': 'FL03418',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'batch_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'warehouse',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Warehouse',
-		'modified': '2011-05-09 18:23:41',
-		'modified_by': 'Administrator',
-		'name': 'FL03419',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'warehouse',
-		'oldfieldtype': 'Link',
-		'options': 'Warehouse',
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'warehouse_type',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': 1,
-		'label': 'Warehouse Type',
-		'modified': '2011-05-09 18:23:41',
-		'modified_by': 'Administrator',
-		'name': 'FL03420',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'warehouse_type',
-		'oldfieldtype': 'Select',
-		'options': 'link:Warehouse Type',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': 'The date at which current entry will get or has actually executed.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'posting_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': 1,
-		'label': 'Posting Date',
-		'modified': '2011-05-09 18:23:41',
-		'modified_by': 'Administrator',
-		'name': 'FL03421',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'posting_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'posting_time',
-		'fieldtype': 'Time',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': 0,
-		'label': 'Posting Time',
-		'modified': '2011-05-09 18:23:41',
-		'modified_by': 'Administrator',
-		'name': 'FL03422',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'posting_time',
-		'oldfieldtype': 'Time',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': 'The date at which current entry is made in system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'transaction_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': 1,
-		'label': 'Transaction Date',
-		'modified': '2011-05-09 18:23:41',
-		'modified_by': 'Administrator',
-		'name': 'FL03423',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'transaction_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'voucher_type',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': 1,
-		'label': 'Voucher Type',
-		'modified': '2011-05-09 18:23:41',
-		'modified_by': 'Administrator',
-		'name': 'FL03424',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'voucher_type',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'voucher_no',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': 1,
-		'label': 'Voucher No',
-		'modified': '2011-05-09 18:23:41',
-		'modified_by': 'Administrator',
-		'name': 'FL03425',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'voucher_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'voucher_detail_no',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Voucher Detail No',
-		'modified': '2011-05-09 18:23:42',
-		'modified_by': 'Administrator',
-		'name': 'FL03426',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'voucher_detail_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'actual_qty',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': 1,
-		'label': 'Actual Quantity',
-		'modified': '2011-05-09 18:23:42',
-		'modified_by': 'Administrator',
-		'name': 'FL03427',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'actual_qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'incoming_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Incoming Rate',
-		'modified': '2011-05-09 18:23:42',
-		'modified_by': 'Administrator',
-		'name': 'FL03428',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'incoming_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'stock_uom',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Stock UOM',
-		'modified': '2011-05-09 18:23:42',
-		'modified_by': 'Administrator',
-		'name': 'FL03435',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'stock_uom',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'bin_aqat',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': 1,
-		'label': 'Bin Actual Qty After Transaction',
-		'modified': '2011-05-09 18:23:42',
-		'modified_by': 'Administrator',
-		'name': 'FL03429',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'bin_aqat',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'ma_rate',
-		'fieldtype': 'Currency',
-		'hidden': 1,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': 'Moving Average Rate',
-		'modified': '2011-05-09 18:23:42',
-		'modified_by': 'Administrator',
-		'name': 'FL03430',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'ma_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fcfs_rate',
-		'fieldtype': 'Currency',
-		'hidden': 1,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'FIFO Rate',
-		'modified': '2011-05-09 18:23:42',
-		'modified_by': 'Administrator',
-		'name': 'FL03431',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'fcfs_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'valuation_rate',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Valuation Rate',
-		'modified': '2011-05-09 18:23:42',
-		'modified_by': 'Administrator',
-		'name': 'FL03432',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'valuation_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'stock_value',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Stock Value',
-		'modified': '2011-05-09 18:23:42',
-		'modified_by': 'Administrator',
-		'name': 'FL03433',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'stock_value',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fcfs_stack',
-		'fieldtype': 'Text',
-		'hidden': 1,
-		'icon': None,
-		'idx': 20,
-		'in_filter': 0,
-		'label': 'FIFO Stack',
-		'modified': '2011-05-09 18:23:42',
-		'modified_by': 'Administrator',
-		'name': 'FL03434',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'fcfs_stack',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'print_hide': 1,
-		'report_hide': 0,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-05-09 18:23:42',
-		'modified_by': 'Administrator',
-		'name': 'FL03436',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-05-09 18:23:42',
-		'modified_by': 'Administrator',
-		'name': 'FL03437',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_cancelled',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': 1,
-		'label': 'Is Cancelled',
-		'modified': '2011-05-09 18:23:42',
-		'modified_by': 'Administrator',
-		'name': 'FL03438',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'is_cancelled',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_stock_entry',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 24,
-		'in_filter': 1,
-		'label': 'Is Stock Entry',
-		'modified': '2011-05-09 18:23:42',
-		'modified_by': 'Administrator',
-		'name': 'FL03439',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'is_stock_entry',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': '100px'
-	}
-]
\ No newline at end of file
diff --git a/material_management/doctype/stock_reconciliation/stock_reconciliation.txt b/material_management/doctype/stock_reconciliation/stock_reconciliation.txt
deleted file mode 100644
index 994a6b8403..0000000000
--- a/material_management/doctype/stock_reconciliation/stock_reconciliation.txt
+++ /dev/null
@@ -1,603 +0,0 @@
-[
-	{
-		'_last_update': '1301391552',
-		'allow_attach': 1,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:26',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': 1,
-		'menu_index': None,
-		'modified': '2011-04-25 11:46:21',
-		'modified_by': 'Administrator',
-		'module': 'Material Management',
-		'name': 'Stock Reconciliation',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'reconciliation_date',
-		'section_style': 'Tray',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 85
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:26',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-04-25 11:46:21',
-		'modified_by': 'Administrator',
-		'name': 'PERM00557',
-		'owner': 'Administrator',
-		'parent': 'Stock Reconciliation',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Material Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:26',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-04-25 11:46:21',
-		'modified_by': 'Administrator',
-		'name': 'PERM00558',
-		'owner': 'Administrator',
-		'parent': 'Stock Reconciliation',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Material Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:26',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-04-25 11:46:21',
-		'modified_by': 'Administrator',
-		'name': 'PERM00559',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Stock Reconciliation',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2011-04-25 11:46:21',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2011-04-25 11:46:21',
-		'modified_by': 'Administrator',
-		'name': '000002610',
-		'owner': 'Administrator',
-		'parent': 'Stock Reconciliation',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:26',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': 1,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Validate Data',
-		'modified': '2011-04-25 11:46:21',
-		'modified_by': 'Administrator',
-		'name': 'FL03440',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'get_reconciliation_stock_details',
-		'owner': 'Administrator',
-		'parent': 'Stock Reconciliation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:26',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Summary',
-		'modified': '2011-04-25 11:46:21',
-		'modified_by': 'Administrator',
-		'name': 'FL03441',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Reconciliation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:26',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'reconciliation_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 0,
-		'label': 'Reconciliation Date',
-		'modified': '2011-04-25 11:46:21',
-		'modified_by': 'Administrator',
-		'name': 'FL03442',
-		'no_copy': None,
-		'oldfieldname': 'reconciliation_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Reconciliation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:26',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'reconciliation_time',
-		'fieldtype': 'Time',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 0,
-		'label': 'Reconciliation Time',
-		'modified': '2011-04-25 11:46:21',
-		'modified_by': 'Administrator',
-		'name': 'FL03443',
-		'no_copy': None,
-		'oldfieldname': 'reconciliation_time',
-		'oldfieldtype': 'Time',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Stock Reconciliation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:26',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'next_step',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Next Steps',
-		'modified': '2011-04-25 11:46:21',
-		'modified_by': 'Administrator',
-		'name': 'FL03444',
-		'no_copy': None,
-		'oldfieldname': 'next_step',
-		'oldfieldtype': 'Select',
-		'options': 'Upload File and Save Document\nValidate Data\nSubmit Document\nCompleted',
-		'owner': 'Administrator',
-		'parent': 'Stock Reconciliation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:26',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'remark',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Remark',
-		'modified': '2011-04-25 11:46:21',
-		'modified_by': 'Administrator',
-		'name': 'FL03445',
-		'no_copy': None,
-		'oldfieldname': 'remark',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Reconciliation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:26',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-04-25 11:46:21',
-		'modified_by': 'Administrator',
-		'name': 'FL03446',
-		'no_copy': None,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
-		'owner': 'Administrator',
-		'parent': 'Stock Reconciliation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:26',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-04-25 11:46:21',
-		'modified_by': 'Administrator',
-		'name': 'FL03447',
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'Stock Reconciliation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-29 15:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Amended From',
-		'modified': '2011-04-25 11:46:21',
-		'modified_by': 'Administrator',
-		'name': '000001851',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Reconciliation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-29 15:08:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Amendment Date',
-		'modified': '2011-04-25 11:46:21',
-		'modified_by': 'Administrator',
-		'name': '000001852',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Reconciliation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:26',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Attachment',
-		'modified': '2011-04-25 11:46:21',
-		'modified_by': 'Administrator',
-		'name': 'FL03448',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Reconciliation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:26',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Attachment HTML',
-		'modified': '2011-04-25 11:46:21',
-		'modified_by': 'Administrator',
-		'name': 'FL03449',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': 'The attachment must be a CSV(Comma Seperated Value) file',
-		'owner': 'Administrator',
-		'parent': 'Stock Reconciliation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:26',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'file_list',
-		'fieldtype': 'Text',
-		'hidden': 1,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'File List',
-		'modified': '2011-04-25 11:46:21',
-		'modified_by': 'Administrator',
-		'name': 'FL03451',
-		'no_copy': None,
-		'oldfieldname': 'file_list',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Stock Reconciliation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/material_management/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt b/material_management/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt
deleted file mode 100644
index 704964a673..0000000000
--- a/material_management/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-26 16:01:43', 'search_fields': None, 'module': 'Material Management', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 0, 'read_only': 0, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 25, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': None, 'name': 'Stock UOM Replace Utility', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00851', 'parent': 'Stock UOM Replace Utility', 'read': 1, 'create': 1, 'creation': '2010-04-26 16:01:43', 'modified': '2010-08-08 14:59:22', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00986', 'parent': 'Stock UOM Replace Utility', 'read': 1, 'create': None, 'creation': '2010-04-29 14:41:57', 'modified': '2010-08-08 14:59:22', 'submit': None, 'doctype': 'DocPerm', 'write': 0, 'idx': 2, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM01069', 'parent': 'Stock UOM Replace Utility', 'read': 1, 'create': 1, 'creation': '2010-07-13 15:10:49', 'modified': '2010-08-08 14:59:22', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'Material Master Manager', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM01070', 'parent': 'Stock UOM Replace Utility', 'read': 1, 'create': 1, 'creation': '2010-07-13 15:10:49', 'modified': '2010-08-08 14:59:22', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 4, 'parenttype': 'DocType', 'role': 'Material Manager', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM01071', 'parent': 'Stock UOM Replace Utility', 'read': 1, 'create': None, 'creation': '2010-07-13 15:10:49', 'modified': '2010-08-08 14:59:22', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 5, 'parenttype': 'DocType', 'role': 'Material Master Manager', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM01072', 'parent': 'Stock UOM Replace Utility', 'read': 1, 'create': None, 'creation': '2010-07-13 15:10:49', 'modified': '2010-08-08 14:59:23', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 6, 'parenttype': 'DocType', 'role': 'Material Manager', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-04-26 16:01:43', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Item', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Stock UOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04899', 'idx': 1, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-08 14:59:23', 'parenttype': 'DocType', 'fieldname': 'item_code', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-04-26 16:01:43', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Current Stock UOM', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Stock UOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04900', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-08-08 14:59:23', 'parenttype': 'DocType', 'fieldname': 'current_stock_uom', 'fieldtype': 'Link', 'options': 'UOM', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-04-26 16:01:43', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'New Stock UOM', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Stock UOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04901', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-08-08 14:59:23', 'parenttype': 'DocType', 'fieldname': 'new_stock_uom', 'fieldtype': 'Link', 'options': 'UOM', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-04-26 16:01:43', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Conversion Factor', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Stock UOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04902', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-08-08 14:59:23', 'parenttype': 'DocType', 'fieldname': 'conversion_factor', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-04-26 17:27:12', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Update', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Stock UOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04903', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-08-08 14:59:23', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Button', 'options': 'update_stock_uom', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/material_management/doctype/uom_conversion_detail/uom_conversion_detail.txt b/material_management/doctype/uom_conversion_detail/uom_conversion_detail.txt
deleted file mode 100644
index 7249533f5a..0000000000
--- a/material_management/doctype/uom_conversion_detail/uom_conversion_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-03-12 12:09:44', 'search_fields': None, 'module': 'Material Management', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 1, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': 'UCDD/.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': None, 'name': 'UOM Conversion Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:09:44', 'doctype': 'DocField', 'oldfieldname': 'uom', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'UOM', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'UOM Conversion Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00660', 'idx': 1, 'default': None, 'colour': None, 'modified': '2009-11-04 16:21:29', 'parenttype': 'DocType', 'fieldname': 'uom', 'fieldtype': 'Link', 'options': 'UOM', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Float', 'creation': '2009-03-12 12:09:44', 'doctype': 'DocField', 'oldfieldname': 'conversion_factor', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Conversion Factor', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'UOM Conversion Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00661', 'idx': 2, 'default': None, 'colour': None, 'modified': '2009-11-04 16:21:29', 'parenttype': 'DocType', 'fieldname': 'conversion_factor', 'fieldtype': 'Float', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/material_management/doctype/valuation_control/valuation_control.txt b/material_management/doctype/valuation_control/valuation_control.txt
deleted file mode 100644
index 8c576a64f3..0000000000
--- a/material_management/doctype/valuation_control/valuation_control.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-07-21 10:40:01', 'search_fields': None, 'module': 'Material Management', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 1, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 4, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Valuation Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/material_management/doctype/warehouse/warehouse.txt b/material_management/doctype/warehouse/warehouse.txt
deleted file mode 100644
index 5272ef810a..0000000000
--- a/material_management/doctype/warehouse/warehouse.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-03-12 12:09:44', 'search_fields': 'warehouse_type', 'module': 'Material Management', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 60, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:warehouse_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': 'Master', 'name': 'Warehouse', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-11-18 12:09:48', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00896', 'parent': 'Warehouse', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:52:07', 'modified': '2010-11-18 12:09:48', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 1, 'parenttype': 'DocType', 'role': 'Material User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 2, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00895', 'parent': 'Warehouse', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:52:07', 'modified': '2010-11-18 12:09:48', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 2, 'parenttype': 'DocType', 'role': 'Material User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00894', 'parent': 'Warehouse', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:52:07', 'modified': '2010-11-18 12:09:48', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 3, 'parenttype': 'DocType', 'role': 'Material User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00871', 'parent': 'Warehouse', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:48:34', 'modified': '2010-11-18 12:09:48', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 4, 'parenttype': 'DocType', 'role': 'Material Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 2, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00870', 'parent': 'Warehouse', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:48:34', 'modified': '2010-11-18 12:09:48', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 5, 'parenttype': 'DocType', 'role': 'Material Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00869', 'parent': 'Warehouse', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:48:34', 'modified': '2010-11-18 12:09:48', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 6, 'parenttype': 'DocType', 'role': 'Material Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00191', 'parent': 'Warehouse', 'read': 1, 'create': None, 'creation': '2009-03-12 14:50:16', 'modified': '2010-11-18 12:09:48', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 7, 'parenttype': 'DocType', 'role': 'All', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': 0, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00207', 'parent': 'Warehouse', 'read': 1, 'create': 1, 'creation': '2009-03-12 15:10:19', 'modified': '2010-11-18 12:09:48', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 8, 'parenttype': 'DocType', 'role': 'Material Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': '', 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00208', 'parent': 'Warehouse', 'read': 1, 'create': None, 'creation': '2009-03-12 15:10:28', 'modified': '2010-11-18 12:09:48', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 9, 'parenttype': 'DocType', 'role': 'Material Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM01050', 'parent': 'Warehouse', 'read': 1, 'create': 1, 'creation': '2010-06-25 14:38:36', 'modified': '2010-11-18 12:09:48', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 10, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00299', 'parent': 'Warehouse', 'read': 1, 'create': 0, 'creation': '2009-05-21 14:14:37', 'modified': '2010-11-18 12:09:48', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 11, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 2, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Warehouse', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04867', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-11-18 12:09:48', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2009-03-12 12:09:44', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Warehouse Detail', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Warehouse', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00662', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-11-18 12:09:48', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:44', 'doctype': 'DocField', 'oldfieldname': 'warehouse_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Warehouse Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Warehouse', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00663', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-11-18 12:09:48', 'parenttype': 'DocType', 'fieldname': 'warehouse_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:09:44', 'doctype': 'DocField', 'oldfieldname': 'warehouse_type', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Warehouse Type', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Warehouse', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00664', 'idx': 4, 'default': None, 'colour': 'White:FFF', 'modified': '2010-11-18 12:09:48', 'parenttype': 'DocType', 'fieldname': 'warehouse_type', 'fieldtype': 'Link', 'options': 'Warehouse Type', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:09:44', 'doctype': 'DocField', 'oldfieldname': 'company', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Company', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'The valuation of items in this warehouse will be considered for the company that is specified', 'parent': 'Warehouse', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL00665', 'idx': 5, 'default': None, 'colour': 'White:FFF', 'modified': '2010-11-18 12:09:48', 'parenttype': 'DocType', 'fieldname': 'company', 'fieldtype': 'Link', 'options': 'Company', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-07-30 13:28:22', 'doctype': 'DocField', 'oldfieldname': 'email_id', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 0, 'modified_by': 'harshada@webnotestech.com', 'label': 'Email Id', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Warehouse', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05760', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-11-18 12:09:48', 'parenttype': 'DocType', 'fieldname': 'email_id', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Select', 'creation': '2010-07-30 13:28:22', 'doctype': 'DocField', 'oldfieldname': 'auto_indent_mail', 'owner': 'harshada@webnotestech.com', 'reqd': 0, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Send Reorder Alert Mail ', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Warehouse', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05759', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-11-18 12:09:48', 'parenttype': 'DocType', 'fieldname': 'auto_indent_mail', 'fieldtype': 'Select', 'options': 'No\nYes', 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Int', 'creation': '2009-03-12 12:09:44', 'doctype': 'DocField', 'oldfieldname': 'phone_no', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Phone No', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Warehouse', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00666', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-11-18 12:09:48', 'parenttype': 'DocType', 'fieldname': 'phone_no', 'fieldtype': 'Int', 'options': 'Phone', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Int', 'creation': '2010-04-22 14:14:43', 'doctype': 'DocField', 'oldfieldname': 'mobile_no', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Mobile No', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Warehouse', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04889', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-11-18 12:09:48', 'parenttype': 'DocType', 'fieldname': 'mobile_no', 'fieldtype': 'Int', 'options': 'Phone', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Column Break', 'creation': '2010-07-30 13:45:16', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Warehouse', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05761', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-11-18 12:09:48', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:44', 'doctype': 'DocField', 'oldfieldname': 'address_line_1', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Address Line 1', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Warehouse', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00667', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-11-18 12:09:48', 'parenttype': 'DocType', 'fieldname': 'address_line_1', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:44', 'doctype': 'DocField', 'oldfieldname': 'address_line_2', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Address Line 2', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Warehouse', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00668', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-11-18 12:09:48', 'parenttype': 'DocType', 'fieldname': 'address_line_2', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 0, 'oldfieldtype': 'Link', 'creation': '2009-12-21 15:27:06', 'doctype': 'DocField', 'oldfieldname': 'country', 'owner': 'wasim@webnotestech.com', 'reqd': 0, 'in_filter': 0, 'print_hide': 0, 'modified_by': 'harshada@webnotestech.com', 'label': 'Country', 'width': '', 'trigger': 'Client', 'depends_on': '', 'docstatus': 0, 'hidden': 0, 'permlevel': 0, 'description': None, 'parent': 'Warehouse', 'search_index': 0, 'allow_on_submit': 0, 'icon': None, 'name': 'FL03529', 'idx': 13, 'default': None, 'colour': None, 'modified': '2010-11-18 12:09:48', 'parenttype': 'DocType', 'fieldname': 'country', 'fieldtype': 'Link', 'options': 'Country', 'report_hide': 0, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-03-12 12:09:44', 'doctype': 'DocField', 'oldfieldname': 'state', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'State', 'width': None, 'trigger': '', 'depends_on': '', 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Warehouse', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00670', 'idx': 14, 'default': None, 'colour': 'White:FFF', 'modified': '2010-11-18 12:09:48', 'parenttype': 'DocType', 'fieldname': 'state', 'fieldtype': 'Select', 'options': '\nSelect country first', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-03-12 12:09:44', 'doctype': 'DocField', 'oldfieldname': 'city', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'City', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Warehouse', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00669', 'idx': 15, 'default': None, 'colour': None, 'modified': '2010-11-18 12:09:48', 'parenttype': 'DocType', 'fieldname': 'city', 'fieldtype': 'Select', 'options': 'link:City', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Int', 'creation': '2009-03-12 12:09:44', 'doctype': 'DocField', 'oldfieldname': 'pin', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'PIN', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Warehouse', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00671', 'idx': 16, 'default': None, 'colour': None, 'modified': '2010-11-18 12:09:48', 'parenttype': 'DocType', 'fieldname': 'pin', 'fieldtype': 'Int', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2009-04-15 10:29:34', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Repost Stock', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 2, 'description': None, 'parent': 'Warehouse', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01913', 'idx': 17, 'default': None, 'colour': None, 'modified': '2010-11-18 12:09:48', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2009-04-15 10:29:34', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Repost Stock Ledger', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 2, 'description': None, 'parent': 'Warehouse', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01914', 'idx': 18, 'default': None, 'colour': None, 'modified': '2010-11-18 12:09:48', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'repost_stock', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/observers.py b/observers.py
deleted file mode 100644
index 2cab98c2c8..0000000000
--- a/observers.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# observers.py
-
-observers = {
-	# Project
-	'Ticket': 				{'on_update':'event_updates.doctype.feed_control.feed_control'},
-
-	# Sales
-	'Customer': 			{'on_update':'event_updates.doctype.feed_control.feed_control'},
-	'Lead': 				{'on_update':'event_updates.doctype.feed_control.feed_control'},
-	'Quotation':			{'on_update':'event_updates.doctype.feed_control.feed_control'},
-	'Sales Order':			{'on_update':'event_updates.doctype.feed_control.feed_control'},
-
-	# Purchase
-	'Supplier': 			{'on_update':'event_updates.doctype.feed_control.feed_control'},
-	'Purchase Order':		{'on_update':'event_updates.doctype.feed_control.feed_control'},
-
-	# Stock
-	'Delivery Note':		{'on_update':'event_updates.doctype.feed_control.feed_control'},
-	
-	# Accounts
-	'Journal Voucher':		{'on_update':'event_updates.doctype.feed_control.feed_control'},
-	'Payable Voucher':		{'on_update':'event_updates.doctype.feed_control.feed_control'},
-	'Receivable Voucher':	{'on_update':'event_updates.doctype.feed_control.feed_control'},
-	
-	# HR
-	'Expense Voucher':		{'on_update':'event_updates.doctype.feed_control.feed_control'},
-	'Salary Slip':			{'on_update':'event_updates.doctype.feed_control.feed_control'},
-	'Leave Transaction':	{'on_update':'event_updates.doctype.feed_control.feed_control'},
-	
-	# Support
-	'Customer Issue':		{'on_update':'event_updates.doctype.feed_control.feed_control'},
-	'Support Ticket':		{'on_update':'event_updates.doctype.feed_control.feed_control'},
-	'Maintenance Visit':	{'on_update':'event_updates.doctype.feed_control.feed_control'}
-
-}
\ No newline at end of file
diff --git a/patches/erpnext_structure_cleanup.py b/patches/erpnext_structure_cleanup.py
new file mode 100644
index 0000000000..ecbd85ce39
--- /dev/null
+++ b/patches/erpnext_structure_cleanup.py
@@ -0,0 +1,164 @@
+#Cleanup all unwanted documents and restructure of moduloes
+#----------------------------------------------------------
+
+import webnotes
+from webnotes.model import delete_doc
+from webnotes.modules.module_manager import reload_doc
+from webnotes.modules.export_module import export_to_files
+sql = webnotes.conn.sql
+
+
+#----------------------------
+
+def delete_unwanted_doctypes():
+	"deletes doctypes which are not used anymore"
+	
+	lst = ['Zone',  'WN Account Control', 'Wiki Page', 'Wiki History', 'Wiki Control', 'While You Were Out', 'Web Visitor', 'Tweet', 'Transfer Utility', 'Transfer Module', 'Transfer Control', 'Transfer Account', 'Tips Common', 'TestTabDT', 'TestDT', 'Test Type', 'Test Run', 'Test Record Detail', 'Test Record', 'Test Case', 'Supplier TDS Category Detail', 'Shopping Cart Control', 'Service Series', 'Series Detail', 'Rule Engine', 'RFQ', 'Report Filter Detail', 'Report Field Detail','Report Control', 'Rating Widget Record', 'Rating Widget Control', 'Rating Template Detail', 'Rating Template', 'PV Ded Tax Detail', 'PV Add Tax Detail', 'Product Variant', 'Product Variance', 'Product Group', 'Product Feature', 'Payroll Tips Common', 'Payroll Rule', 'Password Control', 'Page Visit', 'Patch', 'Multiple Transfer', 'Module Tip Control', 'Module Setter', 'Module Manager', 'Module Import', 'Module Detail', 'Message Control', 'Message', 'Mail Participant Details', 'Mail', 'Leave Type Detail', 'Leave Detail', 'Leave Applicable Detail', 'Lead Item Detail', 'Lead Attachment Detail', 'Item Attachments Detail', 'Instant Message', 'Impact Analysis', 'Forum Topic', 'Forum Control', 'Form Settings', 'Follower', 'ERP Setup', 'Enquiry Attachment Detail', 'Documentation', 'Condition Detail', 'Complaint Note', 'Code History', 'Code Editor', 'Code Backup Control', 'Code Backup', 'City', 'Change Log', 'Business Letter Type', 'Business Letter Template', 'Business Letter', 'Badge Settings Detail', 'Application Type', 'Application', 'Action Detail', 'Accounts Setup', 'Stock Common', 'Job Application', 'Service Schedule', ]
+	for d in lst:
+		sql("delete from `tabProperty Setter` where select_doctype = '%s'" % d)
+		sql("delete from `tabCustom Script` where dt = '%s'" % d)
+		sql("delete from `tabCustom Field` where dt = '%s'" % d)
+		delete_doc('DocType', d)
+		
+	sql("commit")	
+	delete_tables(lst)
+		
+def delete_tables(lst):
+	for d in lst:
+		for t in ['tab', 'arc']:
+			try:
+				sql("drop table `%s%s`" % (t, d))
+			except:
+				continue
+	
+def delete_unwanted_pages():
+	"deletes pages which are not used anymore"
+	lst = ['Transaction Authorization', 'Prduct Display', 'Data Import', 'Partner Home', 'Product Display']
+	for d in lst:
+		delete_doc('Page', d)
+	
+def delete_unwanted_search_criteria():
+	"deletes search criteria which are not used anymore"
+	
+	lst = ['_SRCH00002', '_SRCH00001', 'warranty-amc_summary1', 'test_so4', 'test_so3', 'test_so2', 'test_so1', 'test_so', 'test5', 'target_variance_report1', 'STDSRCH/00006', 'STDSRCH/00005', 'STDSRCH/00004', 'STDSRCH/00003', 'STDSRCH/00002', 'STDSRCH/00001', 'so_pending_items_6', 'so_pending_items_5', 'so_pending_items_3', 'so_pending_items_34', 'scrap', 'sales_report_test', 'salary_structure_details1', 'salary_structure_details2', 'salary_structure_details3', 'salary_slips1', 'projectwise_pending_qty_and_costs2', 'projectwise_pending_qty_and_costs1', 'projectwise_delivered_qty_and_costs1', 'projectwise_delivered_qty_and_costs2', 'New Search Criteria 1', 'monthly_salary_register2', 'monthly_salary_register1', 'installed_items','follow_up_history', 'follow_up_report', 'employee_in_company_experience2', 'employee_in_company_experience1', 'employee_in_company_experience', 'employee_details', 'employee_details1', 'employee_details2', 'employees_birthday1', 'draft_so_pending_items', 'draft_sales_orders', 'delivery_notewise_pending_qty_to_install', 'datewise_leave_report2', 'datewise_leave_report1', 'datewise_leave_report', 'customer_issues1', 'cancelled_so_pending_items1', 'cancelled_so_pending_items', 'budget_variance_report3', 'budget_variance_report1', 'account_-_inputs_rg_23_a_-_part_ii_wrong_one']
+	
+	for d in lst:
+		delete_doc('Search Criteria', d)
+		
+	
+def delete_unwanted_mappers():
+	"deletes unwanted mappers"
+	
+	lst = ['Customer Issue-Maintenance Report', 'Enquiry-Service Quotation', 'Sales Order-Maintenance Report', 'Service Quotation-Service Order', 'Supplier Quotation-Purchase Order', 'Visit Schedule-Maintenance Report']
+	for d in lst:
+		delete_doc('DocType Mapper', d)
+		
+def delete_unwanted_modules():
+	"deletes unwanted modules"
+	lst = ['Developent', 'Recycle Bin', 'Testing', 'Testing System', 'Test', 'System', 'Partner Updates', 'My Company', 'Event Updates', 'E-Commerce']
+	for d in lst:
+		delete_doc('Module Def', d)
+
+
+#---------------------------------------------	
+
+def rename_merge_modules():
+	"Rename module as per users view and merge for removing confusion"
+	
+	rename_lst = [['CRM', 'Selling'], ['SRM','Buying'], ['Material Management', 'Stock'], ['Payroll','HR'], ['Maintenance', 'Support']]
+	for d in rename_lst:
+		# create new module manually and export to file???????
+		reload_doc(d[1], 'module_def', d[1])
+
+	merge_lst = [['Tools', 'Utilities'], ['Application Internal', 'Utilities'], ['Settings', 'Setup']]
+	# settings hardcoded in my_company
+	# module hardcoded in home_control
+	# material_management hardcoded in installation note
+	# maintenance hardcoded in support_email_settings
+	
+	lst = rename_lst + merge_lst
+	for d in lst:
+		update_module(d[0], d[1])
+		delete_doc('Module Def', d[0])
+		
+	
+def update_module(from_mod, to_mod):
+	for t in ['DocType', 'Page', 'Search Criteria', 'DocType Mapper', 'Print Format', 'Role']:
+		sql("update `tab%s` set module='%s' where module = '%s'"% (t, to_mod, from_mod))
+		
+#------------------------------------ 
+def sync_roles():
+	"Put Roles into corresponding module and delete Roles module"
+	
+	# roles
+	roles = {
+		'Accounts'	:		"'Accounts Manager', 'Accounts User'", 
+		'Selling'	: 		"'Customer', 'Sales User', 'Sales Manager', 'Sales Master Manager', 'Partner'", 
+		'Buying'	:		"'Supplier', 'Purchase User', 'Purchase Manager', 'Purchase Master Manager'", 
+		'Stock'		:		"'Material User', 'Material Master Manager', 'Material Manager', 'Quality Manager'", 
+		'Support'	:		"'Support Team', 'Support Manager', 'Maintenance User', 'Maintenance Manager'", 
+		'Production':		"'Production User', 'Production Manager', 'Production Master Manager'", 
+		'Setup'		:		"'System Manager'", 
+		'Projects'	:		"'Projects User'", 
+		'HR'		:		"'HR User', 'HR Manager', 'Employee'",
+		'Core'		:		"'Administrator', 'All', 'Guest'"
+	}
+	for mod in roles.keys():
+		sql("update `tabRole` set module = '%s' where name in (%s)" % (mod, roles[mod]))
+		
+	sql("update `tabDocType` set module = 'Setup' where name = 'Role'")
+	delete_doc('Module Def', 'Roles')
+
+#------------------------------------ 
+def sync_mapper():
+	"Put mappers into corresponding module"
+		
+	mappers = {
+		'Accounts':		('Delivery Note-Receivable Voucher', 'Project-Receivable Voucher', 'Purchase Order-Payable Voucher', 'Purchase Receipt-Payable Voucher', 'Sales Order-Receivable Voucher'), 
+		'Selling': 		('Delivery Note-Installation Note', 'Enquiry-Quotation', 'Lead-Enquiry', 'Lead-Customer', 'Project-Sales Order', 'Quotation-Sales Order', ), 
+		'Buying':		('Indent-Purchase Order', 'Sales Order-Indent'), 
+		'Stock':		('Purchase Order-Purchase Receipt', 'Project-Delivery Note', 'Receivable Voucher-Delivery Note', 'Sales Order-Delivery Note'), 
+		'Support':		('Customer Issue-Maintenance Visit', 'Sales Order-Maintenance Schedule', 'Sales Order-Maintenance Visit'), 
+		'Production':	('Production Forecast-Production Plan', 'Production Forecast-Production Planning Tool', 'Sales Order-Production Plan'), 
+		'HR':			('KRA Template-Appraisal', 'Salary Structure-Salary Slip')
+	}
+	
+	for mod in mappers.keys():
+		sql("update `tabDocType Mapper` set module = '%s' where name in %s" % (mod, mappers[mod]))
+	
+	delete_doc('Module Def', 'Mapper')
+	
+# --------------------------------------
+def export_docs():
+	"""
+		Export all documents where module has been changed
+	"""
+	for dtype in ['DocType', 'Page', 'Search Criteria', 'DocType Mapper', 'Print Format', 'Role']:
+		lst = sql("select name, module from `tab%s`" % dtype)
+		for rec in lst:
+			webnotes.msgprint(rec)
+			export_to_files(record_list = [[dtype, rec[0]]], record_module = rec[1])
+
+	#grep test company
+
+
+#---------------------------------------
+def run_patches():
+	delete_unwanted_doctypes()
+	sql("start transaction")
+	delete_unwanted_pages()
+	delete_unwanted_mappers()
+	delete_unwanted_search_criteria()
+	delete_unwanted_modules()
+
+	rename_merge_modules()
+	sync_roles()
+	sync_mapper()
+	
+
+	# landed cost wizard link in stock
+	reload_doc('stock', 'Module Def', 'stock')
+	sql("update `tabDocType` set module = 'stock' where name in ('LC PR Detail', 'Landed Cost Detail')")
+
+	export_docs()
+	sql("commit")
diff --git a/patches/customer_address.py b/patches/old_patches/customer_address.py
similarity index 100%
rename from patches/customer_address.py
rename to patches/old_patches/customer_address.py
diff --git a/patches/doctype_permission_patch.py b/patches/old_patches/doctype_permission_patch.py
similarity index 100%
rename from patches/doctype_permission_patch.py
rename to patches/old_patches/doctype_permission_patch.py
diff --git a/patches/feed_patch.py b/patches/old_patches/feed_patch.py
similarity index 100%
rename from patches/feed_patch.py
rename to patches/old_patches/feed_patch.py
diff --git a/replacecode.py b/patches/old_patches/replacecode.py
similarity index 100%
rename from replacecode.py
rename to patches/old_patches/replacecode.py
diff --git a/patches/patch.py b/patches/patch.py
index 1ffb0990cd..0f688fe073 100644
--- a/patches/patch.py
+++ b/patches/patch.py
@@ -1,6 +1,6 @@
 # REMEMBER to update this
 # ========================
-last_patch = 305
+last_patch = 306
 
 #-------------------------------------------
 
@@ -1207,3 +1207,6 @@ def execute(patch_no):
 		reload_doc('setup', 'doctype', 'company')
 	elif patch_no == 305:
 		sql("update `tabDocField` set options = 'link:Company' where options='link:Company' and fieldname='company' and fieldtype='Select'")
+	elif patch_no == 306:
+		from erpnext_structure_cleanup import run_patches
+		run_patches()
diff --git a/payroll/Module Def/Payroll/Payroll.js b/payroll/Module Def/Payroll/Payroll.js
deleted file mode 100644
index 98807ee3a6..0000000000
--- a/payroll/Module Def/Payroll/Payroll.js	
+++ /dev/null
@@ -1,9 +0,0 @@
-var hr_set_tips = function() {
-  $c_obj('Module Tip Control', 'get_tip', 'hr', function(r,rt) { 
-    if(r.message) {
-      $(parent.tip_area).html('Tip: ' + r.message).css('display','block');
-    }
-  } );
-}
-
-hr_set_tips();
\ No newline at end of file
diff --git a/payroll/doctype/absent_days_detail/absent_days_detail.txt b/payroll/doctype/absent_days_detail/absent_days_detail.txt
deleted file mode 100644
index 7f10b910d3..0000000000
--- a/payroll/doctype/absent_days_detail/absent_days_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:39', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 5, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Absent Days Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00708', 'parent': 'Absent Days Detail', 'read': 1, 'create': 1, 'creation': '2010-04-01 14:14:39', 'modified': '2010-04-01 15:00:23', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': '', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:39', 'doctype': 'DocField', 'oldfieldname': 'leave_type', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Leave Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Absent Days Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04160', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-04-01 15:00:23', 'parenttype': 'DocType', 'fieldname': 'leave_type', 'fieldtype': 'Select', 'options': 'link:Leave Type', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:39', 'doctype': 'DocField', 'oldfieldname': 'no_of_leave_days', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'No of leave days', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Absent Days Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04161', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-04-01 15:00:23', 'parenttype': 'DocType', 'fieldname': 'no_of_leave_days', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-04-01 14:14:39', 'doctype': 'DocField', 'oldfieldname': 'from_date', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'From Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Absent Days Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04162', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-04-01 15:00:23', 'parenttype': 'DocType', 'fieldname': 'from_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-04-01 14:14:39', 'doctype': 'DocField', 'oldfieldname': 'to_date', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'To Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Absent Days Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04163', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-04-01 15:00:23', 'parenttype': 'DocType', 'fieldname': 'to_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:39', 'doctype': 'DocField', 'oldfieldname': 'previous_balance', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Previous Balance', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Absent Days Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04164', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-04-01 15:00:23', 'parenttype': 'DocType', 'fieldname': 'previous_balance', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:39', 'doctype': 'DocField', 'oldfieldname': 'current_balance', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Current Balance', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Absent Days Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04165', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-04-01 15:00:23', 'parenttype': 'DocType', 'fieldname': 'current_balance', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:39', 'doctype': 'DocField', 'oldfieldname': 'max_allowed', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Max. Allowed', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Absent Days Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04166', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-04-01 15:00:23', 'parenttype': 'DocType', 'fieldname': 'max_allowed', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/action_detail/action_detail.txt b/payroll/doctype/action_detail/action_detail.txt
deleted file mode 100644
index d1e5234f7b..0000000000
--- a/payroll/doctype/action_detail/action_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:39', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 5, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Action Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-04-01 14:14:39', 'doctype': 'DocField', 'oldfieldname': 'rule_master', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Master', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Action Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04167', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-04-01 15:00:43', 'parenttype': 'DocType', 'fieldname': 'rule_master', 'fieldtype': 'Link', 'options': 'DocType', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:39', 'doctype': 'DocField', 'oldfieldname': 'rule_field', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Field', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Action Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04168', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-04-01 15:00:43', 'parenttype': 'DocType', 'fieldname': 'rule_field', 'fieldtype': 'Select', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:39', 'doctype': 'DocField', 'oldfieldname': 'expression', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Expression', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Action Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04169', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-04-01 15:00:43', 'parenttype': 'DocType', 'fieldname': 'expression', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/appraisal/appraisal.txt b/payroll/doctype/appraisal/appraisal.txt
deleted file mode 100644
index 0410d8debf..0000000000
--- a/payroll/doctype/appraisal/appraisal.txt
+++ /dev/null
@@ -1,962 +0,0 @@
-[
-	{
-		'_last_update': '1308808105',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'APRSL.#####',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:48:05',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'Appraisal',
-		'name_case': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'status, employee, employee_name',
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
-		'version': 160
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-09-01 15:48:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2010-09-01 15:48:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00664',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-09-01 15:48:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2010-09-01 15:48:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00665',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-09-01 15:48:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2010-09-01 15:48:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00666',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-09-01 15:48:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2010-09-01 15:48:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00667',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-09-01 15:48:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2010-09-01 15:48:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00668',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-09-01 15:48:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2010-09-01 15:48:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00669',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-09-01 15:48:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 7,
-		'match': None,
-		'modified': '2010-09-01 15:48:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00670',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-09-01 15:48:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 8,
-		'match': None,
-		'modified': '2010-09-01 15:48:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00671',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'HR User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:10',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Employee Details',
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'name': 'FL05653',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:48:05',
-		'default': 'Draft',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': 1,
-		'label': 'Status',
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'name': 'FL03803',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Select',
-		'options': '\nDraft\nSubmitted\nCompleted\nCancelled',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:48:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'employee',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 1,
-		'label': 'Employee',
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'name': 'FL03804',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'employee',
-		'oldfieldtype': 'Link',
-		'options': 'Employee',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'employee_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Employee Name',
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'name': 'FL03805',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'employee_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'name': 'FL03806',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'name': 'FL03807',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:10',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'name': 'FL05654',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'start_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': 1,
-		'label': 'Start Date',
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'name': 'FL03809',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'start_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'end_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': 1,
-		'label': 'End Date',
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'name': 'FL03810',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'end_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:48:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'kra_approver',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': 0,
-		'label': 'Approver',
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'name': 'FL03811',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'kra_approver',
-		'oldfieldtype': 'Select',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Amended From',
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'name': 'FL03812',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'hidden': 1,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Amendment Date',
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'name': 'FL03813',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '160px'
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:48:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Declare Completed',
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'name': 'FL03814',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:10',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'name': 'FL05655',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:48:05',
-		'default': None,
-		'depends_on': None,
-		'description': 'Select template from which you want to fetch KRA',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'kra_template',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'KRA Template',
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'name': 'FL03816',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'kra_template',
-		'oldfieldtype': 'Link',
-		'options': 'KRA Template',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': 'Fetch Template',
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'name': 'FL03817',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'fetch_kra',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:48:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': 1,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Update',
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'name': 'FL03818',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:48:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'appraisal_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Appraisal Details',
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'name': 'FL03819',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'appraisal_details',
-		'oldfieldtype': 'Table',
-		'options': 'Appraisal Detail',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-09-01 15:48:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Calculate Total Score',
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'name': 'FL03820',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'calculate_total',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'total_score',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'Total Score',
-		'modified': '2011-06-27 14:39:10',
-		'modified_by': 'Administrator',
-		'name': 'FL03821',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'total_score',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Appraisal',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/payroll/doctype/appraisal_detail/appraisal_detail.txt b/payroll/doctype/appraisal_detail/appraisal_detail.txt
deleted file mode 100644
index 702d6550a0..0000000000
--- a/payroll/doctype/appraisal_detail/appraisal_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-08-30 15:44:06', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'ashwini@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 13, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'APRSLD.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': None, 'name': 'Appraisal Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-08-30 15:44:06', 'doctype': 'DocField', 'oldfieldname': 'kra', 'owner': 'ashwini@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'KRA', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Key Responsibility Area', 'parent': 'Appraisal Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06074', 'idx': 1, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-01 15:02:52', 'parenttype': 'DocType', 'fieldname': 'kra', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-08-30 15:44:06', 'doctype': 'DocField', 'oldfieldname': 'per_weightage', 'owner': 'ashwini@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Weightage (%)', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Appraisal Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06075', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-01 15:02:52', 'parenttype': 'DocType', 'fieldname': 'per_weightage', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Small Text', 'creation': '2010-08-30 15:44:06', 'doctype': 'DocField', 'oldfieldname': 'target_achieved', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Target Achieved', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Appraisal Detail', 'search_index': None, 'allow_on_submit': 1, 'icon': None, 'name': 'FL06076', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-01 15:02:52', 'parenttype': 'DocType', 'fieldname': 'target_achieved', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Select', 'creation': '2010-08-30 15:44:06', 'doctype': 'DocField', 'oldfieldname': 'score', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Score (0-5)', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Appraisal Detail', 'search_index': None, 'allow_on_submit': 1, 'icon': None, 'name': 'FL06077', 'idx': 4, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-01 15:02:52', 'parenttype': 'DocType', 'fieldname': 'score', 'fieldtype': 'Select', 'options': '\n0\n1\n2\n3\n4\n5', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Currency', 'creation': '2010-08-30 15:44:06', 'doctype': 'DocField', 'oldfieldname': 'score_earned', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Score Earned', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Appraisal Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06078', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-09-01 15:02:52', 'parenttype': 'DocType', 'fieldname': 'score_earned', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/attendance/attendance.txt b/payroll/doctype/attendance/attendance.txt
deleted file mode 100644
index 6ce89951be..0000000000
--- a/payroll/doctype/attendance/attendance.txt
+++ /dev/null
@@ -1,523 +0,0 @@
-[
-	{
-		'_last_update': '1308808105',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-23 10:26:03',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-06-27 14:39:08',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'Attendance',
-		'name_case': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'employee, employee_name, att_date, status',
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
-		'version': 74
-	},
-	{
-		'amend': None,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-09-23 17:47:09',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': None,
-		'modified': '2010-09-23 17:47:09',
-		'modified_by': 'harshada@webnotestech.com',
-		'name': 'PERM00692',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Attendance',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-09-23 17:47:09',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': None,
-		'modified': '2010-09-23 17:47:09',
-		'modified_by': 'harshada@webnotestech.com',
-		'name': 'PERM00693',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Attendance',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-09-23 10:26:03',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2010-09-23 17:46:48',
-		'modified_by': 'harshada@webnotestech.com',
-		'name': 'PERM00687',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Attendance',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Attendance Details',
-		'modified': '2011-06-27 14:39:08',
-		'modified_by': 'Administrator',
-		'name': 'FL05645',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Attendance',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-23 10:26:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'naming_series',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Naming Series',
-		'modified': '2011-06-27 14:39:08',
-		'modified_by': 'Administrator',
-		'name': 'FL03918',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'naming_series',
-		'oldfieldtype': 'Select',
-		'options': 'ATT',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Attendance',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-23 10:26:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'employee',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 1,
-		'label': 'Employee',
-		'modified': '2011-06-27 14:39:08',
-		'modified_by': 'Administrator',
-		'name': 'FL03919',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'employee',
-		'oldfieldtype': 'Link',
-		'options': 'Employee',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Attendance',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-23 10:26:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'employee_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Employee Name',
-		'modified': '2011-06-27 14:39:08',
-		'modified_by': 'Administrator',
-		'name': 'FL03920',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'employee_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Attendance',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-23 10:26:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': 1,
-		'label': 'Status',
-		'modified': '2011-06-27 14:39:08',
-		'modified_by': 'Administrator',
-		'name': 'FL03921',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Select',
-		'options': '\nPresent\nAbsent\nHalf Day',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Attendance',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-10-27 16:07:27',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'shifts',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Shifts',
-		'modified': '2010-10-27 16:07:27',
-		'modified_by': 'sneha@webnotestech.com',
-		'name': 'FL04164',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'shifts',
-		'oldfieldtype': 'Select',
-		'options': '\nDay\nNight',
-		'owner': 'sneha@webnotestech.com',
-		'parent': 'Attendance',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-23 10:26:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'leave_type',
-		'fieldtype': 'Link',
-		'hidden': 1,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Leave Type',
-		'modified': '2011-06-27 14:39:08',
-		'modified_by': 'Administrator',
-		'name': 'FL03922',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'leave_type',
-		'oldfieldtype': 'Link',
-		'options': 'Leave Type',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Attendance',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:08',
-		'modified_by': 'Administrator',
-		'name': 'FL05646',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Attendance',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-23 10:26:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'att_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': 1,
-		'label': 'Attendance Date',
-		'modified': '2011-06-27 14:39:08',
-		'modified_by': 'Administrator',
-		'name': 'FL03924',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'att_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Attendance',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-23 10:26:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-06-27 14:39:08',
-		'modified_by': 'Administrator',
-		'name': 'FL03925',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Attendance',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-23 10:26:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-06-27 14:39:08',
-		'modified_by': 'Administrator',
-		'name': 'FL03926',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Attendance',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/payroll/doctype/attendance_control_panel/attendance_control_panel.txt b/payroll/doctype/attendance_control_panel/attendance_control_panel.txt
deleted file mode 100644
index 433466c443..0000000000
--- a/payroll/doctype/attendance_control_panel/attendance_control_panel.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-10-05 14:25:28', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'harshada@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': 1, 'show_in_menu': None, 'max_attachments': 1, 'version': 128, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': '', 'name': 'Attendance Control Panel', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-12-02 18:06:47', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM01205', 'parent': 'Attendance Control Panel', 'read': 1, 'create': 1, 'creation': '2010-10-05 14:25:28', 'modified': '2010-12-02 18:06:47', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM01206', 'parent': 'Attendance Control Panel', 'read': 1, 'create': 1, 'creation': '2010-10-05 14:25:28', 'modified': '2010-12-02 18:06:47', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'HR User', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM01207', 'parent': 'Attendance Control Panel', 'read': 1, 'create': 1, 'creation': '2010-10-05 14:25:28', 'modified': '2010-12-02 18:06:47', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'HR Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM01210', 'parent': 'Attendance Control Panel', 'read': 1, 'create': None, 'creation': '2010-10-05 16:09:12', 'modified': '2010-12-02 18:06:47', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 4, 'parenttype': 'DocType', 'role': 'HR User', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM01211', 'parent': 'Attendance Control Panel', 'read': 1, 'create': None, 'creation': '2010-10-05 16:09:12', 'modified': '2010-12-02 18:06:47', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 5, 'parenttype': 'DocType', 'role': 'HR Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-10-05 16:24:29', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Download Template', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': "Get the template of the Attendance for which you want to import in CSV (Comma seperated values) format.\nFill data in the template. Save the template in CSV format.\nAll attendance dates inbetween 'Attendance From Date' and 'Attendance To Date' will come in the template with employees list.", 'parent': 'Attendance Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06221', 'idx': 1, 'default': None, 'colour': 'White:FFF', 'modified': '2010-12-02 18:06:47', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-10-05 14:25:28', 'doctype': 'DocField', 'oldfieldname': 'attenadnce_date', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Attendance From Date', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Selected Attendance date will comes in the attendance template.', 'parent': 'Attendance Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06205', 'idx': 2, 'default': None, 'colour': 'White:FFF', 'modified': '2010-12-02 18:06:47', 'parenttype': 'DocType', 'fieldname': 'att_fr_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2010-10-05 14:25:28', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Get Template', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': '', 'parent': 'Attendance Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06206', 'idx': 3, 'default': None, 'colour': 'White:FFF', 'modified': '2010-12-02 18:06:47', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-10-05 16:36:27', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Attendance Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06224', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-12-02 18:06:47', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-10-05 16:36:27', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Attendance To Date', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'All attendance dates inbetween selected Attendance From Date and Attendance To Date will come in the template with employees list.', 'parent': 'Attendance Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06225', 'idx': 5, 'default': None, 'colour': 'White:FFF', 'modified': '2010-12-02 18:06:47', 'parenttype': 'DocType', 'fieldname': 'att_to_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-10-05 16:24:29', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Upload Attendance Data', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'To import attendance data, click on "Add" button, select the saved CSV file and click on "Upload".\nSelect the date format as attendance date format in CSV file.\nClick on "Import".', 'parent': 'Attendance Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06222', 'idx': 6, 'default': None, 'colour': 'White:FFF', 'modified': '2010-12-02 18:06:47', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-10-05 18:31:39', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Import Date Format ', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Attendance Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06232', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-12-02 18:06:47', 'parenttype': 'DocType', 'fieldname': 'import_date_format', 'fieldtype': 'Select', 'options': 'yyyy-mm-dd\nmm/dd/yyyy\nmm/dd/yy\ndd-mm-yyyy\ndd/mm/yyyy', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-10-05 18:31:39', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Overwrite', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Attendance Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06233', 'idx': 8, 'default': '', 'colour': 'White:FFF', 'modified': '2010-12-02 18:06:47', 'parenttype': 'DocType', 'fieldname': 'overwrite', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-10-05 16:16:45', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Import', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Attendance Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06215', 'idx': 9, 'default': None, 'colour': 'White:FFF', 'modified': '2010-12-02 18:06:47', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Button', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-10-05 16:05:51', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'File List', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Attendance Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06214', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-12-02 18:06:47', 'parenttype': 'DocType', 'fieldname': 'file_list', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-10-06 10:56:22', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Import Log', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Attendance Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06235', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-12-02 18:06:47', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-10-06 10:56:22', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Import Log1', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Attendance Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06236', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-12-02 18:06:47', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/branch/branch.js b/payroll/doctype/branch/branch.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/payroll/doctype/branch/branch.txt b/payroll/doctype/branch/branch.txt
deleted file mode 100644
index 13420fc346..0000000000
--- a/payroll/doctype/branch/branch.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:39', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 12, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:branch', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Branch', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00710', 'parent': 'Branch', 'read': 1, 'create': 1, 'creation': '2010-04-01 14:14:39', 'modified': '2010-09-20 08:57:23', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00797', 'parent': 'Branch', 'read': 1, 'create': 1, 'creation': '2010-04-19 09:54:14', 'modified': '2010-09-20 08:57:23', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'HR User', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00798', 'parent': 'Branch', 'read': 1, 'create': 1, 'creation': '2010-04-19 09:54:14', 'modified': '2010-09-20 08:57:23', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'HR Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Branch', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04827', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 08:57:23', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:39', 'doctype': 'DocField', 'oldfieldname': 'branch', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Branch', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Branch', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04177', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 08:57:23', 'parenttype': 'DocType', 'fieldname': 'branch', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/chapter_vi_a_detail/chapter_vi_a_detail.txt b/payroll/doctype/chapter_vi_a_detail/chapter_vi_a_detail.txt
deleted file mode 100644
index 198b9debcf..0000000000
--- a/payroll/doctype/chapter_vi_a_detail/chapter_vi_a_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:39', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 9, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Chapter VI A Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00711', 'parent': 'Chapter VI A Detail', 'read': 1, 'create': None, 'creation': '2010-04-01 14:14:39', 'modified': '2010-04-01 15:01:44', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00712', 'parent': 'Chapter VI A Detail', 'read': 1, 'create': None, 'creation': '2010-04-01 14:14:39', 'modified': '2010-04-01 15:01:44', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-01 14:14:39', 'doctype': 'DocField', 'oldfieldname': 'particulars3', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Particulars', 'width': '300px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Chapter VI A Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04178', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-04-01 15:01:44', 'parenttype': 'DocType', 'fieldname': 'particulars3', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:40', 'doctype': 'DocField', 'oldfieldname': 'under_section3', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Under Section', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Chapter VI A Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04179', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-04-01 15:01:44', 'parenttype': 'DocType', 'fieldname': 'under_section3', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:40', 'doctype': 'DocField', 'oldfieldname': 'max_limit3', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Max. Limit', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Chapter VI A Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04180', 'idx': 3, 'default': None, 'colour': 'White:FFF', 'modified': '2010-04-01 15:01:44', 'parenttype': 'DocType', 'fieldname': 'max_limit3', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:40', 'doctype': 'DocField', 'oldfieldname': 'actual_amount3', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Actual Amount', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Chapter VI A Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04181', 'idx': 4, 'default': None, 'colour': 'White:FFF', 'modified': '2010-04-01 15:01:44', 'parenttype': 'DocType', 'fieldname': 'actual_amount3', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:40', 'doctype': 'DocField', 'oldfieldname': 'eligible_amount3', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Eligible Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Chapter VI A Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04182', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-04-01 15:01:44', 'parenttype': 'DocType', 'fieldname': 'eligible_amount3', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:40', 'doctype': 'DocField', 'oldfieldname': 'modified_amount3', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Modified Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Chapter VI A Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04183', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-04-01 15:01:44', 'parenttype': 'DocType', 'fieldname': 'modified_amount3', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/city/city.js b/payroll/doctype/city/city.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/payroll/doctype/city/city.txt b/payroll/doctype/city/city.txt
deleted file mode 100644
index 400209d350..0000000000
--- a/payroll/doctype/city/city.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:40', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 9, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:city_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'City', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00713', 'parent': 'City', 'read': 1, 'create': 1, 'creation': '2010-04-01 14:14:40', 'modified': '2010-09-20 09:04:30', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00789', 'parent': 'City', 'read': 1, 'create': 1, 'creation': '2010-04-19 09:52:11', 'modified': '2010-09-20 09:04:30', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'HR User', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00790', 'parent': 'City', 'read': 1, 'create': 1, 'creation': '2010-04-19 09:52:11', 'modified': '2010-09-20 09:04:30', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'HR Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'City', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04831', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 09:04:30', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:40', 'doctype': 'DocField', 'oldfieldname': 'city_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'City Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'City', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04184', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 09:04:30', 'parenttype': 'DocType', 'fieldname': 'city_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-04-01 14:14:40', 'doctype': 'DocField', 'oldfieldname': 'state', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'State', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'City', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04185', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-20 09:04:30', 'parenttype': 'DocType', 'fieldname': 'state', 'fieldtype': 'Link', 'options': 'State', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/condition_detail/condition_detail.txt b/payroll/doctype/condition_detail/condition_detail.txt
deleted file mode 100644
index 2dcc6a2ea5..0000000000
--- a/payroll/doctype/condition_detail/condition_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:40', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 16, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Condition Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00714', 'parent': 'Condition Detail', 'read': 1, 'create': None, 'creation': '2010-04-01 14:14:40', 'modified': '2010-04-01 15:02:27', 'submit': None, 'doctype': 'DocPerm', 'write': 0, 'idx': 1, 'parenttype': 'DocType', 'role': 'All', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-04-01 14:14:40', 'doctype': 'DocField', 'oldfieldname': 'rule_master', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Form', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Condition Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04198', 'idx': 1, 'default': None, 'colour': 'White:FFF', 'modified': '2010-04-01 15:02:27', 'parenttype': 'DocType', 'fieldname': 'rule_master', 'fieldtype': 'Link', 'options': 'DocType', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:40', 'doctype': 'DocField', 'oldfieldname': 'rule_field', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Field', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Condition Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04199', 'idx': 2, 'default': None, 'colour': 'White:FFF', 'modified': '2010-04-01 15:02:27', 'parenttype': 'DocType', 'fieldname': 'rule_field', 'fieldtype': 'Select', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:40', 'doctype': 'DocField', 'oldfieldname': 'operator', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Operator', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Condition Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04200', 'idx': 3, 'default': None, 'colour': 'White:FFF', 'modified': '2010-04-01 15:02:27', 'parenttype': 'DocType', 'fieldname': 'operator', 'fieldtype': 'Select', 'options': '\nEquals\nNot Equals\nGreater than\nGreater than or Equals\nLess than\nLess than or Equals', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:40', 'doctype': 'DocField', 'oldfieldname': 'value', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Value', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Condition Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04201', 'idx': 4, 'default': None, 'colour': 'White:FFF', 'modified': '2010-04-01 15:02:27', 'parenttype': 'DocType', 'fieldname': 'value', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/declaration_detail/declaration_detail.txt b/payroll/doctype/declaration_detail/declaration_detail.txt
deleted file mode 100644
index 62e58f7488..0000000000
--- a/payroll/doctype/declaration_detail/declaration_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:40', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 7, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Declaration Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00715', 'parent': 'Declaration Detail', 'read': 1, 'create': None, 'creation': '2010-04-01 14:14:40', 'modified': '2010-04-01 15:02:51', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00716', 'parent': 'Declaration Detail', 'read': 1, 'create': None, 'creation': '2010-04-01 14:14:40', 'modified': '2010-04-01 15:02:51', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-01 14:14:40', 'doctype': 'DocField', 'oldfieldname': 'particulars1', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Particulars', 'width': '200px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Declaration Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04203', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-04-01 15:02:51', 'parenttype': 'DocType', 'fieldname': 'particulars1', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:40', 'doctype': 'DocField', 'oldfieldname': 'under_section1', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Under Section', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Declaration Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04204', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-04-01 15:02:51', 'parenttype': 'DocType', 'fieldname': 'under_section1', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:40', 'doctype': 'DocField', 'oldfieldname': 'max_limit1', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Max. Limit', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Declaration Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04205', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-04-01 15:02:51', 'parenttype': 'DocType', 'fieldname': 'max_limit1', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:40', 'doctype': 'DocField', 'oldfieldname': 'actual_amount1', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Actual Amount', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Declaration Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04206', 'idx': 4, 'default': None, 'colour': 'White:FFF', 'modified': '2010-04-01 15:02:51', 'parenttype': 'DocType', 'fieldname': 'actual_amount1', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:40', 'doctype': 'DocField', 'oldfieldname': 'eligible_amount1', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Eligible Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Declaration Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04207', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-04-01 15:02:51', 'parenttype': 'DocType', 'fieldname': 'eligible_amount1', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:40', 'doctype': 'DocField', 'oldfieldname': 'modified_amount1', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Modified Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Declaration Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04208', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-04-01 15:02:51', 'parenttype': 'DocType', 'fieldname': 'modified_amount1', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/deduction_detail/deduction_detail.txt b/payroll/doctype/deduction_detail/deduction_detail.txt
deleted file mode 100644
index 4ac264d69b..0000000000
--- a/payroll/doctype/deduction_detail/deduction_detail.txt
+++ /dev/null
@@ -1,160 +0,0 @@
-[
-	{
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': '',
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:57',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': 1,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2010-11-02 20:44:58',
-		'modified_by': 'sneha@webnotestech.com',
-		'module': 'Payroll',
-		'name': 'Deduction Detail',
-		'name_case': '',
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': '',
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': '',
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 14
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'd_type',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Type',
-		'modified': '2010-08-08 17:08:57',
-		'modified_by': 'Administrator',
-		'name': 'FL00900',
-		'no_copy': None,
-		'oldfieldname': 'd_type',
-		'oldfieldtype': 'Select',
-		'options': 'Deduction Type',
-		'owner': 'Administrator',
-		'parent': 'Deduction Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': '200px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'd_modified_amt',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Amount',
-		'modified': '2010-08-08 17:08:57',
-		'modified_by': 'Administrator',
-		'name': 'FL00902',
-		'no_copy': None,
-		'oldfieldname': 'd_modified_amt',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Deduction Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': ''
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'depend_on_lwp',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Depend on LWP',
-		'modified': '2010-08-08 17:08:57',
-		'modified_by': 'Administrator',
-		'name': 'FL00903',
-		'no_copy': None,
-		'oldfieldname': 'depend_on_lwp',
-		'oldfieldtype': 'Check',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Deduction Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/payroll/doctype/deduction_type/deduction_type.js b/payroll/doctype/deduction_type/deduction_type.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/payroll/doctype/deduction_type/deduction_type.txt b/payroll/doctype/deduction_type/deduction_type.txt
deleted file mode 100644
index 0e0256e4d8..0000000000
--- a/payroll/doctype/deduction_type/deduction_type.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:40', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': 1, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 13, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:deduction_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': 'Master', 'name': 'Deduction Type', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-10-12 17:19:47', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00719', 'parent': 'Deduction Type', 'read': 1, 'create': 1, 'creation': '2010-04-01 14:14:41', 'modified': '2010-10-12 17:19:47', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00803', 'parent': 'Deduction Type', 'read': 1, 'create': 1, 'creation': '2010-04-19 09:55:37', 'modified': '2010-10-12 17:19:47', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'HR User', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00804', 'parent': 'Deduction Type', 'read': 1, 'create': 1, 'creation': '2010-04-19 09:55:37', 'modified': '2010-10-12 17:19:47', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'HR Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Deduction Type', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04838', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-10-12 17:19:47', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'deduction_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Deduction Type', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04212', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-10-12 17:19:47', 'parenttype': 'DocType', 'fieldname': 'deduction_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Deduction Type', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04213', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-10-12 17:19:47', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/department/department.js b/payroll/doctype/department/department.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/payroll/doctype/department/department.txt b/payroll/doctype/department/department.txt
deleted file mode 100644
index da9f38c6b5..0000000000
--- a/payroll/doctype/department/department.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:41', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 8, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:department_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Department', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00720', 'parent': 'Department', 'read': 1, 'create': 1, 'creation': '2010-04-01 14:14:41', 'modified': '2010-09-20 09:24:25', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00793', 'parent': 'Department', 'read': 1, 'create': 1, 'creation': '2010-04-19 09:53:18', 'modified': '2010-09-20 09:24:25', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'HR User', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00794', 'parent': 'Department', 'read': 1, 'create': 1, 'creation': '2010-04-19 09:53:18', 'modified': '2010-09-20 09:24:25', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'HR Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Department', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04839', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 09:24:25', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'department_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Department', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Department', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04215', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 09:24:25', 'parenttype': 'DocType', 'fieldname': 'department_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/designation/designation.js b/payroll/doctype/designation/designation.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/payroll/doctype/designation/designation.txt b/payroll/doctype/designation/designation.txt
deleted file mode 100644
index eb58d05387..0000000000
--- a/payroll/doctype/designation/designation.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:41', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 8, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:designation_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Designation', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00721', 'parent': 'Designation', 'read': 1, 'create': 1, 'creation': '2010-04-01 14:14:41', 'modified': '2010-09-20 09:24:40', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00795', 'parent': 'Designation', 'read': 1, 'create': 1, 'creation': '2010-04-19 09:53:48', 'modified': '2010-09-20 09:24:40', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'HR User', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00796', 'parent': 'Designation', 'read': 1, 'create': 1, 'creation': '2010-04-19 09:53:48', 'modified': '2010-09-20 09:24:40', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'HR Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Designation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04840', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 09:24:40', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'designation_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Designation', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Designation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04216', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 09:24:40', 'parenttype': 'DocType', 'fieldname': 'designation_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/earn_deduction_detail/earn_deduction_detail.txt b/payroll/doctype/earn_deduction_detail/earn_deduction_detail.txt
deleted file mode 100644
index 1e8cb1cdce..0000000000
--- a/payroll/doctype/earn_deduction_detail/earn_deduction_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:41', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 4, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Earn Deduction Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00722', 'parent': 'Earn Deduction Detail', 'read': 1, 'create': 1, 'creation': '2010-04-01 14:14:41', 'modified': '2010-04-01 15:04:16', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'All', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'earn_deduction_name', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Earn/Deduction Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Earn Deduction Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04217', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-04-01 15:04:16', 'parenttype': 'DocType', 'fieldname': 'earn_deduction_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'mode', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Mode', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Earn Deduction Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04218', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-04-01 15:04:16', 'parenttype': 'DocType', 'fieldname': 'mode', 'fieldtype': 'Select', 'options': '\n%\nRs', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'per', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Per.(%)', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Earn Deduction Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04219', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-04-01 15:04:16', 'parenttype': 'DocType', 'fieldname': 'per', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'amount', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Earn Deduction Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04220', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-04-01 15:04:16', 'parenttype': 'DocType', 'fieldname': 'amount', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'type', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Earn Deduction Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04221', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-04-01 15:04:16', 'parenttype': 'DocType', 'fieldname': 'type', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/earning_detail/earning_detail.txt b/payroll/doctype/earning_detail/earning_detail.txt
deleted file mode 100644
index fafcf43ac2..0000000000
--- a/payroll/doctype/earning_detail/earning_detail.txt
+++ /dev/null
@@ -1,160 +0,0 @@
-[
-	{
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:59',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': 0,
-		'hide_toolbar': 0,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': 1,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-02-09 13:02:55',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'Earning Detail',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 28
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'e_type',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Type',
-		'modified': '2011-02-09 13:02:55',
-		'modified_by': 'Administrator',
-		'name': 'FL01069',
-		'no_copy': None,
-		'oldfieldname': 'e_type',
-		'oldfieldtype': 'Data',
-		'options': 'Earning Type',
-		'owner': 'Administrator',
-		'parent': 'Earning Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': '200px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'modified_value',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Amount',
-		'modified': '2011-02-09 13:02:55',
-		'modified_by': 'Administrator',
-		'name': 'FL01071',
-		'no_copy': None,
-		'oldfieldname': 'modified_value',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Earning Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': ''
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'depend_on_lwp',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Depend on LWP',
-		'modified': '2011-02-09 13:02:55',
-		'modified_by': 'Administrator',
-		'name': 'FL01072',
-		'no_copy': None,
-		'oldfieldname': 'depend_on_lwp',
-		'oldfieldtype': 'Check',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Earning Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/payroll/doctype/earning_type/earning_type.js b/payroll/doctype/earning_type/earning_type.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/payroll/doctype/earning_type/earning_type.txt b/payroll/doctype/earning_type/earning_type.txt
deleted file mode 100644
index 4bb27a923b..0000000000
--- a/payroll/doctype/earning_type/earning_type.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:41', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': 1, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 15, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:earning_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': 'Master', 'name': 'Earning Type', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-10-12 17:15:46', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00725', 'parent': 'Earning Type', 'read': 1, 'create': 1, 'creation': '2010-04-01 14:14:41', 'modified': '2010-10-12 17:15:46', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00801', 'parent': 'Earning Type', 'read': 1, 'create': 1, 'creation': '2010-04-19 09:55:12', 'modified': '2010-10-12 17:15:46', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'HR User', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00802', 'parent': 'Earning Type', 'read': 1, 'create': 1, 'creation': '2010-04-19 09:55:12', 'modified': '2010-10-12 17:15:46', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'HR Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Earning Type', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04841', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-10-12 17:15:46', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'earning_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Earning Type', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04226', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-10-12 17:15:46', 'parenttype': 'DocType', 'fieldname': 'earning_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Earning Type', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04227', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-10-12 17:15:46', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'taxable', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Taxable', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Earning Type', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04229', 'idx': 4, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-12 17:15:46', 'parenttype': 'DocType', 'fieldname': 'taxable', 'fieldtype': 'Select', 'options': '\nYes\nNo', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'exemption_limit', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Exemption Limit', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Earning Type', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04230', 'idx': 5, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-12 17:15:46', 'parenttype': 'DocType', 'fieldname': 'exemption_limit', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/educational_qualifications/educational_qualifications.txt b/payroll/doctype/educational_qualifications/educational_qualifications.txt
deleted file mode 100644
index 45786773e7..0000000000
--- a/payroll/doctype/educational_qualifications/educational_qualifications.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:41', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 11, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': None, 'name': 'Educational Qualifications', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-05-25 14:55:39', 'doctype': 'DocField', 'oldfieldname': 'school_univ', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'School/University', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Educational Qualifications', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05041', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-05-25 14:55:39', 'parenttype': 'DocType', 'fieldname': 'school_univ', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'qualification', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Qualification (Degree/Diploma)', 'width': '170px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Educational Qualifications', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL04232', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-05-25 14:55:39', 'parenttype': 'DocType', 'fieldname': 'qualification', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'level', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Level', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Educational Qualifications', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL04233', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-05-25 14:55:39', 'parenttype': 'DocType', 'fieldname': 'level', 'fieldtype': 'Select', 'options': '\nGraduate\nPost Graduate\nUnder Graduate', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Int', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'year_of_passing', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Year of Passing', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Educational Qualifications', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04234', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-05-25 14:55:39', 'parenttype': 'DocType', 'fieldname': 'year_of_passing', 'fieldtype': 'Int', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'class_percent', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Class / Percentage', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Educational Qualifications', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04235', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-05-25 14:55:39', 'parenttype': 'DocType', 'fieldname': 'class_percent', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'maj_opt_sub', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Major / Optional Subject', 'width': '170px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Educational Qualifications', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04236', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-05-25 14:55:39', 'parenttype': 'DocType', 'fieldname': 'maj_opt_sub', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/educational_qualifications_detail/educational_qualifications_detail.txt b/payroll/doctype/educational_qualifications_detail/educational_qualifications_detail.txt
deleted file mode 100644
index 3c83000b13..0000000000
--- a/payroll/doctype/educational_qualifications_detail/educational_qualifications_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:41', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 5, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': None, 'name': 'Educational Qualifications Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-05-25 15:05:17', 'doctype': 'DocField', 'oldfieldname': 'school_univ', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'School/University', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Educational Qualifications Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05046', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-05-25 15:05:17', 'parenttype': 'DocType', 'fieldname': 'school_univ', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'qualification', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Qualification', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Educational Qualifications Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04238', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-05-25 15:05:17', 'parenttype': 'DocType', 'fieldname': 'qualification', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'level', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Level', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Educational Qualifications Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04239', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-05-25 15:05:17', 'parenttype': 'DocType', 'fieldname': 'level', 'fieldtype': 'Select', 'options': 'Graduate\nPost Graduate\nUnder Graduate', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Int', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'year_of_passing', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Year of Passing', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Educational Qualifications Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04240', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-05-25 15:05:17', 'parenttype': 'DocType', 'fieldname': 'year_of_passing', 'fieldtype': 'Int', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:41', 'doctype': 'DocField', 'oldfieldname': 'class_per', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Class / Percentage', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Educational Qualifications Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04241', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-05-25 15:05:17', 'parenttype': 'DocType', 'fieldname': 'class_per', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2010-05-25 15:05:17', 'doctype': 'DocField', 'oldfieldname': 'maj_opt_subj', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Major/Optional Subjects', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Educational Qualifications Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05047', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-05-25 15:05:17', 'parenttype': 'DocType', 'fieldname': 'maj_opt_subj', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/employee/employee.txt b/payroll/doctype/employee/employee.txt
deleted file mode 100644
index fbc2883a82..0000000000
--- a/payroll/doctype/employee/employee.txt
+++ /dev/null
@@ -1,3184 +0,0 @@
-[
-	{
-		'_last_update': '1308918132',
-		'allow_attach': 1,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': 1,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-17 11:16:08',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'Employee',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'employee_name',
-		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': '%(employee_name)s',
-		'tag_fields': 'status',
-		'use_template': None,
-		'version': 443
-	},
-	{
-		'amend': None,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-02-17 11:16:08',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-02-23 15:05:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00823',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2011-02-17 11:16:08',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-02-23 15:05:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00824',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'All',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-02-17 11:16:08',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-02-23 15:05:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00825',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Employee',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR User',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-02-17 11:16:08',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2011-02-23 15:05:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00826',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Employee',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2011-02-17 11:16:08',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2011-02-23 15:05:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00827',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Employee',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'HR User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2011-02-17 11:16:08',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2011-02-23 15:05:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00828',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Employee',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Basic Information',
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05624',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05625',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': 'To manage multiple series please go to Setup > Manage Series',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'naming_series',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Naming Series',
-		'modified': '2011-06-27 14:39:02',
-		'modified_by': 'Administrator',
-		'name': 'FL04691',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'naming_series',
-		'oldfieldtype': 'Select',
-		'options': 'WN-EMP\nEMP/',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'salutation',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Salutation',
-		'modified': '2011-06-27 14:39:02',
-		'modified_by': 'Administrator',
-		'name': 'FL04689',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'salutation',
-		'oldfieldtype': 'Select',
-		'options': '\nMr\nMs',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'employee_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Employee Name',
-		'modified': '2011-06-27 14:39:02',
-		'modified_by': 'Administrator',
-		'name': 'FL04690',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'employee_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'employee_number',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': 1,
-		'label': 'Employee Number',
-		'modified': '2011-06-27 14:39:02',
-		'modified_by': 'Administrator',
-		'name': 'FL04692',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'employee_number',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'date_of_joining',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Date of Joining',
-		'modified': '2011-06-27 14:39:02',
-		'modified_by': 'Administrator',
-		'name': 'FL04693',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'date_of_joining',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'date_of_birth',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': 1,
-		'label': 'Date of Birth',
-		'modified': '2011-06-27 14:39:02',
-		'modified_by': 'Administrator',
-		'name': 'FL04694',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'date_of_birth',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 0,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'gender',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': 1,
-		'label': 'Gender',
-		'modified': '2011-06-27 14:39:02',
-		'modified_by': 'Administrator',
-		'name': 'FL04695',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'gender',
-		'oldfieldtype': 'Select',
-		'options': '\nMale\nFemale',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:02',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-06-27 14:39:02',
-		'modified_by': 'Administrator',
-		'name': 'FL05619',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Link:Company',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05626',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-17 11:16:08',
-		'default': 'Active',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': 1,
-		'label': 'Status',
-		'modified': '2011-06-27 14:39:02',
-		'modified_by': 'Administrator',
-		'name': 'FL04697',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Select',
-		'options': '\nActive\nLeft',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'employment_type',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': 1,
-		'label': 'Employment Type',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04698',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'employment_type',
-		'oldfieldtype': 'Link',
-		'options': 'Employment Type',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'scheduled_confirmation_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': 1,
-		'label': 'Scheduled Confirmation Date',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04699',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'scheduled_confirmation_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'final_confirmation_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Final Confirmation Date',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04700',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'final_confirmation_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contract_end_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': 1,
-		'label': 'Contract End Date',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04701',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'contract_end_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'date_of_retirement',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Date Of Retirement',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04702',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'date_of_retirement',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': 'Applicable Holiday List',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'holiday_list',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Holiday List',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04703',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'holiday_list',
-		'oldfieldtype': 'Link',
-		'options': 'Holiday List',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Job Profile',
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05627',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05628',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'branch',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': 1,
-		'label': 'Branch',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04706',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'branch',
-		'oldfieldtype': 'Link',
-		'options': 'Branch',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'department',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': 1,
-		'label': 'Department',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04707',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'department',
-		'oldfieldtype': 'Link',
-		'options': 'Department',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'designation',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': 1,
-		'label': 'Designation',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04708',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'designation',
-		'oldfieldtype': 'Link',
-		'options': 'Designation',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'grade',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 24,
-		'in_filter': 1,
-		'label': 'Grade',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04709',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'grade',
-		'oldfieldtype': 'Link',
-		'options': 'Grade',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'reports_to',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 25,
-		'in_filter': None,
-		'label': 'Reports to',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04710',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'reports_to',
-		'oldfieldtype': 'Link',
-		'options': 'Employee',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': 'Provide email id registered in company',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company_email',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 26,
-		'in_filter': 1,
-		'label': 'Email (By company)',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04711',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'company_email',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-23 14:42:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_sales_person',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 27,
-		'in_filter': None,
-		'label': 'Is Sales Person',
-		'modified': '2011-02-23 15:05:17',
-		'modified_by': 'Administrator',
-		'name': 'FL04883',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 28,
-		'in_filter': None,
-		'label': 'Salary Information',
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05629',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'salary_mode',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 29,
-		'in_filter': None,
-		'label': 'Salary Mode',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04713',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'salary_mode',
-		'oldfieldtype': 'Select',
-		'options': '\nBank\nCash \nCheque',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': "eval:doc.salary_mode == 'Bank'",
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'bank_name',
-		'fieldtype': 'Data',
-		'hidden': 0,
-		'icon': None,
-		'idx': 30,
-		'in_filter': 1,
-		'label': 'Bank Name',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04714',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'bank_name',
-		'oldfieldtype': 'Link',
-		'options': 'Suggest',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': "eval:doc.salary_mode == 'Bank'",
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'bank_ac_no',
-		'fieldtype': 'Data',
-		'hidden': 0,
-		'icon': None,
-		'idx': 31,
-		'in_filter': None,
-		'label': 'Bank A/C No.',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04715',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'bank_ac_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'esic_card_no',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 32,
-		'in_filter': None,
-		'label': 'ESIC CARD No',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04716',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'esic_card_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'pf_number',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 33,
-		'in_filter': None,
-		'label': 'PF Number',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04717',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'pf_number',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'gratuity_lic_id',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 34,
-		'in_filter': None,
-		'label': 'Gratuity LIC ID',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04718',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'gratuity_lic_id',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 35,
-		'in_filter': None,
-		'label': 'Contact Details',
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05630',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 36,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05631',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'cell_number',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 37,
-		'in_filter': None,
-		'label': 'Cell Number',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04721',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'personal_email',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 38,
-		'in_filter': None,
-		'label': 'Personal Email',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04722',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'notice_number_of_days',
-		'fieldtype': 'Int',
-		'hidden': None,
-		'icon': None,
-		'idx': 39,
-		'in_filter': None,
-		'label': 'Notice - Number of Days',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04755',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'notice_number_of_days',
-		'oldfieldtype': 'Int',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 40,
-		'in_filter': None,
-		'label': 'Emergency Contact Details',
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05632',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Emergency Contact Details',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'person_to_be_contacted',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 41,
-		'in_filter': None,
-		'label': 'Person To Be Contacted',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04724',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'relation',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 42,
-		'in_filter': None,
-		'label': 'Relation',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04725',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'emergency_phone_number',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 43,
-		'in_filter': None,
-		'label': 'Emergency Phone Number',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04726',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 44,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05633',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'permanent_accommodation_type',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 45,
-		'in_filter': None,
-		'label': 'Permanent Accommodation Type',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04728',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': '\nRented\nOwned',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'permanent_address',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 46,
-		'in_filter': None,
-		'label': 'Permanent Address',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04729',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'current_accommodation_type',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 47,
-		'in_filter': None,
-		'label': 'Current Accommodation Type',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04730',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': '\nRented\nOwned',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'current_address',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 48,
-		'in_filter': None,
-		'label': 'Current Address',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04731',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 49,
-		'in_filter': None,
-		'label': 'Personal Details',
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05634',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 50,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05635',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'pan_number',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 51,
-		'in_filter': None,
-		'label': 'PAN Number',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04734',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'passport_number',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 52,
-		'in_filter': None,
-		'label': 'Passport Number',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04735',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-27 14:39:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': 1,
-		'icon': None,
-		'idx': 53,
-		'in_filter': None,
-		'label': 'Employee Profile',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL05621',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'date_of_issue',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 54,
-		'in_filter': None,
-		'label': 'Date of Issue',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04736',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'valid_upto',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 55,
-		'in_filter': None,
-		'label': 'Valid Upto',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04737',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-27 14:39:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': 1,
-		'icon': None,
-		'idx': 56,
-		'in_filter': None,
-		'label': 'Salary Structure',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL05622',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'place_of_issue',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 57,
-		'in_filter': None,
-		'label': 'Place of Issue',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04738',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'marital_status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 58,
-		'in_filter': None,
-		'label': 'Marital Status',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04739',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': '\nSingle\nMarried\nDivorced\nWidowed',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'blood_group',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 59,
-		'in_filter': None,
-		'label': 'Blood Group',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04740',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': '\nA+\nA-\nB+\nB-\nAB+\nAB-\nO+\nO-',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 60,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05636',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': 'Here you can maintain family details like name and occupation of parent, spouse and children',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'family_background',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 61,
-		'in_filter': None,
-		'label': 'Family Background',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04742',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': 'Here you can maintain height, weight, allergies, medical concerns etc',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'health_details',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 62,
-		'in_filter': None,
-		'label': 'Health Details',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04743',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 63,
-		'in_filter': None,
-		'label': 'Educational Qualification',
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05637',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'educational_qualification_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 64,
-		'in_filter': None,
-		'label': 'Educational Qualification Details',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04745',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Educational Qualifications Detail',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 65,
-		'in_filter': None,
-		'label': 'Career History',
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05638',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 66,
-		'in_filter': None,
-		'label': 'Previous Work Experience',
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05639',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Simple',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'previous_experience_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 67,
-		'in_filter': None,
-		'label': 'Previous Experience Details',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04748',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Previous Experience Detail',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 68,
-		'in_filter': None,
-		'label': 'History In Company',
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05640',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Simple',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'experience_in_company_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 69,
-		'in_filter': None,
-		'label': 'Experience In Company Details',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04750',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Experience In Company Detail',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 70,
-		'in_filter': None,
-		'label': 'Exit',
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05641',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 71,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05642',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'resignation_letter_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 72,
-		'in_filter': None,
-		'label': 'Resignation Letter Date',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04753',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'resignation_letter_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'relieving_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 73,
-		'in_filter': 1,
-		'label': 'Relieving Date',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04754',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'relieving_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'reason_for_leaving',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 74,
-		'in_filter': None,
-		'label': 'Reason for Leaving',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04756',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'reason_for_leaving',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'leave_encashed',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 75,
-		'in_filter': None,
-		'label': 'Leave Encashed?',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04757',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'leave_encashed',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'encashment_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 76,
-		'in_filter': None,
-		'label': 'Encashment Date',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04758',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'encashment_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 77,
-		'in_filter': None,
-		'label': 'Exit Interview Details',
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05643',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'col_brk6',
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'held_on',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 78,
-		'in_filter': None,
-		'label': 'Held On',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04760',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'held_on',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'reason_for_resignation',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 79,
-		'in_filter': None,
-		'label': 'Reason for Resignation',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04761',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'reason_for_resignation',
-		'oldfieldtype': 'Select',
-		'options': '\nBetter Prospects\nHealth Concerns',
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'new_workplace',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 80,
-		'in_filter': None,
-		'label': 'New Workplace',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04762',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'new_workplace',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'feedback',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 81,
-		'in_filter': None,
-		'label': 'Feedback',
-		'modified': '2011-06-27 14:39:03',
-		'modified_by': 'Administrator',
-		'name': 'FL04763',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'feedback',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'file_list',
-		'fieldtype': 'Text',
-		'hidden': 1,
-		'icon': None,
-		'idx': 82,
-		'in_filter': None,
-		'label': 'File List',
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL05623',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 11:16:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'trash_reason',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 83,
-		'in_filter': None,
-		'label': 'Trash Reason',
-		'modified': '2011-06-27 14:39:04',
-		'modified_by': 'Administrator',
-		'name': 'FL04685',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'trash_reason',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/payroll/doctype/employment_type/employment_type.js b/payroll/doctype/employment_type/employment_type.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/payroll/doctype/employment_type/employment_type.txt b/payroll/doctype/employment_type/employment_type.txt
deleted file mode 100644
index 1a5bd4aac1..0000000000
--- a/payroll/doctype/employment_type/employment_type.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:44', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 18, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:employee_type_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Employment Type', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00730', 'parent': 'Employment Type', 'read': 1, 'create': 1, 'creation': '2010-04-01 14:14:44', 'modified': '2010-09-20 09:38:36', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00807', 'parent': 'Employment Type', 'read': 1, 'create': 1, 'creation': '2010-04-19 09:56:40', 'modified': '2010-09-20 09:38:36', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'HR User', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00808', 'parent': 'Employment Type', 'read': 1, 'create': 1, 'creation': '2010-04-19 09:56:41', 'modified': '2010-09-20 09:38:36', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'HR Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:44', 'doctype': 'DocField', 'oldfieldname': 'employee_type_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Employment Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Employment Type', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04371', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 09:38:36', 'parenttype': 'DocType', 'fieldname': 'employee_type_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Employment Type', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04844', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 09:38:36', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/expense_type/expense_type.js b/payroll/doctype/expense_type/expense_type.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/payroll/doctype/expense_type/expense_type.txt b/payroll/doctype/expense_type/expense_type.txt
deleted file mode 100644
index 67573aa950..0000000000
--- a/payroll/doctype/expense_type/expense_type.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-08-23 18:05:43', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'harshada@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 6, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'field:expense_type', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Expense Type', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01128', 'parent': 'Expense Type', 'read': 1, 'create': 1, 'creation': '2010-08-23 18:24:07', 'modified': '2010-09-20 09:39:02', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01129', 'parent': 'Expense Type', 'read': 1, 'create': 1, 'creation': '2010-08-23 18:24:07', 'modified': '2010-09-20 09:39:02', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'HR Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01159', 'parent': 'Expense Type', 'read': 1, 'create': 1, 'creation': '2010-09-03 10:46:22', 'modified': '2010-09-20 09:39:02', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'System Manager', 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-08-23 18:05:43', 'doctype': 'DocField', 'oldfieldname': 'expense_type', 'owner': 'harshada@webnotestech.com', 'reqd': 1, 'in_filter': 0, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Expense Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Expense Type', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL05980', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 09:39:02', 'parenttype': 'DocType', 'fieldname': 'expense_type', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-08-23 18:05:43', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Expense Type', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05981', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 09:39:02', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/expense_voucher/expense_voucher.txt b/payroll/doctype/expense_voucher/expense_voucher.txt
deleted file mode 100644
index 8f413b044f..0000000000
--- a/payroll/doctype/expense_voucher/expense_voucher.txt
+++ /dev/null
@@ -1,975 +0,0 @@
-[
-	{
-		'_last_update': '1308808105',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'EXP.######',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-03 16:45:08',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'Expense Voucher',
-		'name_case': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'approval_status,employee,employee_name',
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': 'From %(employee_name)s for %(total_claimed_amount)s (claimed)',
-		'tag_fields': 'approval_status',
-		'use_template': None,
-		'version': 134
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-03-01 10:14:12',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': 'owner',
-		'modified': '2011-03-01 10:14:12',
-		'modified_by': 'Administrator',
-		'name': 'PERM00831',
-		'owner': 'Administrator',
-		'parent': 'Expense Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': None,
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-03-01 10:14:12',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': None,
-		'modified': '2011-03-01 10:14:12',
-		'modified_by': 'Administrator',
-		'name': 'PERM00832',
-		'owner': 'Administrator',
-		'parent': 'Expense Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-03-01 10:14:12',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': None,
-		'modified': '2011-03-01 10:14:12',
-		'modified_by': 'Administrator',
-		'name': 'PERM00833',
-		'owner': 'Administrator',
-		'parent': 'Expense Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-03-01 10:14:13',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': 'owner',
-		'modified': '2011-03-01 10:14:13',
-		'modified_by': 'Administrator',
-		'name': 'PERM00834',
-		'owner': 'Administrator',
-		'parent': 'Expense Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': None,
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-03-01 10:14:13',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': None,
-		'modified': '2011-03-01 10:14:13',
-		'modified_by': 'Administrator',
-		'name': 'PERM00835',
-		'owner': 'Administrator',
-		'parent': 'Expense Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-03-01 10:14:13',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': None,
-		'modified': '2011-03-01 10:14:13',
-		'modified_by': 'Administrator',
-		'name': 'PERM00836',
-		'owner': 'Administrator',
-		'parent': 'Expense Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-09-03 16:45:08',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': '',
-		'modified': '2010-09-03 16:45:08',
-		'modified_by': 'Administrator',
-		'name': 'PERM00683',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'All',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Details',
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL05648',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-03 16:45:08',
-		'default': 'Draft',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'approval_status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': 1,
-		'label': 'Approval Status',
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL03883',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'approval_status',
-		'oldfieldtype': 'Select',
-		'options': '\nDraft\nSubmitted\nApproved \nRejected\nCancelled',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-03 16:45:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'employee',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 1,
-		'label': 'From Employee',
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL03884',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'employee',
-		'oldfieldtype': 'Link',
-		'options': 'Employee',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-03 16:45:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'employee_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Employee Name',
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL03885',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'employee_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-03 16:45:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL03886',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-03 16:45:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL03887',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL05649',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-03 16:45:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'posting_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': 1,
-		'label': 'Posting Date',
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL03889',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'posting_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-03 16:45:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'exp_approver',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Approver',
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL03890',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'exp_approver',
-		'oldfieldtype': 'Select',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '160px'
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': 'White:FFF',
-		'creation': '2010-09-03 16:45:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'remark',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Remark',
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL03891',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'remark',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-03 16:45:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Amended From',
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL03892',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '160px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-03 16:45:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Amendment Date',
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL03893',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '160px'
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-09-03 16:45:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': 1,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Approve',
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL03894',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-09-03 16:45:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': 1,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Reject',
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL03895',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Expense Details',
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL05650',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': 'White:FFF',
-		'creation': '2010-09-03 16:45:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': 'Calculate Total Amount',
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL03897',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-03 16:45:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'total_claimed_amount',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': 0,
-		'label': 'Total Claimed Amount',
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL03898',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'total_claimed_amount',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '160px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-03 16:45:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'total_sanctioned_amount',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': 0,
-		'label': 'Total Sanctioned Amount',
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL03899',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'total_sanctioned_amount',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '160px'
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-09-03 16:45:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': 1,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Update Voucher',
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL03900',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-09-03 16:45:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'expense_voucher_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'Expense Voucher Details',
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL03901',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'expense_voucher_details',
-		'oldfieldtype': 'Table',
-		'options': 'Expense Voucher Detail',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-10-15 14:56:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'email_id',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
-		'label': 'Employees Email Id',
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'name': 'FL04039',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'email_id',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/payroll/doctype/expense_voucher_detail/expense_voucher_detail.txt b/payroll/doctype/expense_voucher_detail/expense_voucher_detail.txt
deleted file mode 100644
index 66afc7052f..0000000000
--- a/payroll/doctype/expense_voucher_detail/expense_voucher_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-08-23 18:10:16', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'harshada@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 5, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': None, 'name': 'Expense Voucher Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-08-23 18:10:16', 'doctype': 'DocField', 'oldfieldname': 'expense_date', 'owner': 'harshada@webnotestech.com', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Expense Date', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Expense Voucher Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05982', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-03 16:32:58', 'parenttype': 'DocType', 'fieldname': 'expense_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-08-23 18:10:16', 'doctype': 'DocField', 'oldfieldname': 'expense_type', 'owner': 'harshada@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Expense Type', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Expense Voucher Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05983', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-03 16:32:58', 'parenttype': 'DocType', 'fieldname': 'expense_type', 'fieldtype': 'Link', 'options': 'Expense Type', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-08-23 18:10:16', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Description', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Expense Voucher Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05984', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-03 16:32:58', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-08-23 18:10:16', 'doctype': 'DocField', 'oldfieldname': 'claim_amount', 'owner': 'harshada@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Claim Amount', 'width': '150px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Expense Voucher Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05985', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-09-03 16:32:58', 'parenttype': 'DocType', 'fieldname': 'claim_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Currency', 'creation': '2010-08-23 18:10:16', 'doctype': 'DocField', 'oldfieldname': 'sanctioned_amount', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Sanctioned Amount', 'width': '150px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Expense Voucher Detail', 'search_index': None, 'allow_on_submit': 1, 'icon': None, 'name': 'FL05986', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-09-03 16:32:58', 'parenttype': 'DocType', 'fieldname': 'sanctioned_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/experience_in_company_detail/experience_in_company_detail.txt b/payroll/doctype/experience_in_company_detail/experience_in_company_detail.txt
deleted file mode 100644
index 0e3fa7580f..0000000000
--- a/payroll/doctype/experience_in_company_detail/experience_in_company_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:44', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 6, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Experience In Company Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:44', 'doctype': 'DocField', 'oldfieldname': 'branch', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Branch', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Experience In Company Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04372', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-04-01 15:13:20', 'parenttype': 'DocType', 'fieldname': 'branch', 'fieldtype': 'Select', 'options': 'link:Branch', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:44', 'doctype': 'DocField', 'oldfieldname': 'department', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Department', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Experience In Company Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04373', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-04-01 15:13:20', 'parenttype': 'DocType', 'fieldname': 'department', 'fieldtype': 'Select', 'options': 'link:Department', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:44', 'doctype': 'DocField', 'oldfieldname': 'designation', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Designation', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Experience In Company Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04374', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-04-01 15:13:20', 'parenttype': 'DocType', 'fieldname': 'designation', 'fieldtype': 'Select', 'options': 'link:Designation', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:44', 'doctype': 'DocField', 'oldfieldname': 'grade', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Grade', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Experience In Company Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04375', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-04-01 15:13:20', 'parenttype': 'DocType', 'fieldname': 'grade', 'fieldtype': 'Select', 'options': 'link:Grade', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-04-01 14:14:44', 'doctype': 'DocField', 'oldfieldname': 'from_date', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'From Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Experience In Company Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04376', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-04-01 15:13:20', 'parenttype': 'DocType', 'fieldname': 'from_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-04-01 14:14:44', 'doctype': 'DocField', 'oldfieldname': 'to_date', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'To Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Experience In Company Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04377', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-04-01 15:13:20', 'parenttype': 'DocType', 'fieldname': 'to_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/grade/grade.js b/payroll/doctype/grade/grade.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/payroll/doctype/grade/grade.txt b/payroll/doctype/grade/grade.txt
deleted file mode 100644
index 7732cf13aa..0000000000
--- a/payroll/doctype/grade/grade.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:44', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 8, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:grade_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Grade', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00731', 'parent': 'Grade', 'read': 1, 'create': 1, 'creation': '2010-04-01 14:14:44', 'modified': '2010-09-20 09:41:00', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00799', 'parent': 'Grade', 'read': 1, 'create': 1, 'creation': '2010-04-19 09:54:49', 'modified': '2010-09-20 09:41:00', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'HR User', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00800', 'parent': 'Grade', 'read': 1, 'create': 1, 'creation': '2010-04-19 09:54:49', 'modified': '2010-09-20 09:41:00', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'HR Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Grade', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04846', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 09:41:00', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:44', 'doctype': 'DocField', 'oldfieldname': 'grade_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Grade', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Grade', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04378', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 09:41:00', 'parenttype': 'DocType', 'fieldname': 'grade_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/holiday_list/holiday_list.js b/payroll/doctype/holiday_list/holiday_list.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/payroll/doctype/holiday_list/holiday_list.txt b/payroll/doctype/holiday_list/holiday_list.txt
deleted file mode 100644
index 14b6c2828e..0000000000
--- a/payroll/doctype/holiday_list/holiday_list.txt
+++ /dev/null
@@ -1,381 +0,0 @@
-[
-	{
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': 1,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:03',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-02-12 13:37:12',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'Holiday List',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 17
-	},
-	{
-		'amend': None,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:03',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-02-12 13:37:12',
-		'modified_by': 'Administrator',
-		'name': 'PERM00249',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Holiday List',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2011-02-11 14:00:28',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-02-12 13:37:12',
-		'modified_by': 'Administrator',
-		'name': 'PERM00806',
-		'owner': 'Administrator',
-		'parent': 'Holiday List',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'trash_reason',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Trash Reason',
-		'modified': '2011-02-12 13:37:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01452',
-		'no_copy': None,
-		'oldfieldname': 'trash_reason',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Holiday List',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'holiday_list_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Holiday List Name',
-		'modified': '2011-02-12 13:37:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01453',
-		'no_copy': None,
-		'oldfieldname': 'holiday_list_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Holiday List',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-12 13:37:12',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_default',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Default',
-		'modified': '2011-02-12 13:37:12',
-		'modified_by': 'Administrator',
-		'name': 'FL04508',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Holiday List',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-02-12 13:37:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01454',
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Link',
-		'options': 'link:Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'Holiday List',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-11 14:00:13',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'weekly_off',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Weekly Off',
-		'modified': '2011-02-12 13:37:12',
-		'modified_by': 'Administrator',
-		'name': 'FL04505',
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': '\nSunday\nMonday\nTuesday\nWednesday\nThursday\nFriday\nSaturday',
-		'owner': 'Administrator',
-		'parent': 'Holiday List',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-11 14:00:13',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Get Weekly Off Dates',
-		'modified': '2011-02-12 13:37:12',
-		'modified_by': 'Administrator',
-		'name': 'FL04506',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'get_weekly_off_dates',
-		'owner': 'Administrator',
-		'parent': 'Holiday List',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'holiday_list_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Holiday List Details',
-		'modified': '2011-02-12 13:37:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01455',
-		'no_copy': None,
-		'oldfieldname': 'holiday_list_details',
-		'oldfieldtype': 'Table',
-		'options': 'Holiday List Detail',
-		'owner': 'Administrator',
-		'parent': 'Holiday List',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-11 17:19:50',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Clear Table',
-		'modified': '2011-02-12 13:37:12',
-		'modified_by': 'Administrator',
-		'name': 'FL04507',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'clear_table',
-		'owner': 'Administrator',
-		'parent': 'Holiday List',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/payroll/doctype/holiday_list_detail/holiday_list_detail.txt b/payroll/doctype/holiday_list_detail/holiday_list_detail.txt
deleted file mode 100644
index 2c2406bdd1..0000000000
--- a/payroll/doctype/holiday_list_detail/holiday_list_detail.txt
+++ /dev/null
@@ -1,125 +0,0 @@
-[
-	{
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:03',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': 1,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-02-11 14:23:09',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'Holiday List Detail',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 4
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Description',
-		'modified': '2011-02-11 14:23:09',
-		'modified_by': 'Administrator',
-		'name': 'FL01456',
-		'no_copy': None,
-		'oldfieldname': 'holiday_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Holiday List Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'holiday_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Date',
-		'modified': '2011-02-11 14:23:09',
-		'modified_by': 'Administrator',
-		'name': 'FL01457',
-		'no_copy': None,
-		'oldfieldname': 'holiday_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Holiday List Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	}
-]
\ No newline at end of file
diff --git a/payroll/doctype/invest_80_declaration_detail/invest_80_declaration_detail.txt b/payroll/doctype/invest_80_declaration_detail/invest_80_declaration_detail.txt
deleted file mode 100644
index c2cb6ca52e..0000000000
--- a/payroll/doctype/invest_80_declaration_detail/invest_80_declaration_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:44', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 10, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Invest 80 Declaration Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00733', 'parent': 'Invest 80 Declaration Detail', 'read': 1, 'create': None, 'creation': '2010-04-01 14:14:44', 'modified': '2010-04-01 15:14:59', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00734', 'parent': 'Invest 80 Declaration Detail', 'read': 1, 'create': None, 'creation': '2010-04-01 14:14:44', 'modified': '2010-04-01 15:14:59', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-01 14:14:44', 'doctype': 'DocField', 'oldfieldname': 'particulars4', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Particulars', 'width': '300px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Invest 80 Declaration Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04383', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-04-01 15:14:59', 'parenttype': 'DocType', 'fieldname': 'particulars4', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:44', 'doctype': 'DocField', 'oldfieldname': 'under_section4', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Under Section', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Invest 80 Declaration Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04384', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-04-01 15:14:59', 'parenttype': 'DocType', 'fieldname': 'under_section4', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:44', 'doctype': 'DocField', 'oldfieldname': 'max_limit4', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Max. Limit', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Invest 80 Declaration Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04385', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-04-01 15:14:59', 'parenttype': 'DocType', 'fieldname': 'max_limit4', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:44', 'doctype': 'DocField', 'oldfieldname': 'actual_amount4', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Actual Amount', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Invest 80 Declaration Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04386', 'idx': 4, 'default': None, 'colour': 'White:FFF', 'modified': '2010-04-01 15:14:59', 'parenttype': 'DocType', 'fieldname': 'actual_amount4', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:44', 'doctype': 'DocField', 'oldfieldname': 'eligible_amount4', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Eligible Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Invest 80 Declaration Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04387', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-04-01 15:14:59', 'parenttype': 'DocType', 'fieldname': 'eligible_amount4', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:44', 'doctype': 'DocField', 'oldfieldname': 'modified_amount4', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Modified Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Invest 80 Declaration Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04388', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-04-01 15:14:59', 'parenttype': 'DocType', 'fieldname': 'modified_amount4', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/it_checklist/it_checklist.txt b/payroll/doctype/it_checklist/it_checklist.txt
deleted file mode 100644
index 16d04310d3..0000000000
--- a/payroll/doctype/it_checklist/it_checklist.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:44', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 456, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': 1, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': None, 'name': 'IT Checklist', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00735', 'parent': 'IT Checklist', 'read': 1, 'create': 1, 'creation': '2010-04-01 14:14:44', 'modified': '2010-09-08 17:17:29', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00825', 'parent': 'IT Checklist', 'read': 1, 'create': 1, 'creation': '2010-04-19 10:02:04', 'modified': '2010-09-08 17:17:29', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'HR User', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00826', 'parent': 'IT Checklist', 'read': 1, 'create': 1, 'creation': '2010-04-19 10:02:04', 'modified': '2010-09-08 17:17:29', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'HR Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM01010', 'parent': 'IT Checklist', 'read': 1, 'create': None, 'creation': '2010-05-25 10:47:36', 'modified': '2010-09-08 17:17:29', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 4, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM01011', 'parent': 'IT Checklist', 'read': 1, 'create': None, 'creation': '2010-05-25 10:47:36', 'modified': '2010-09-08 17:17:29', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 5, 'parenttype': 'DocType', 'role': 'HR User', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM01012', 'parent': 'IT Checklist', 'read': 1, 'create': None, 'creation': '2010-05-25 10:47:36', 'modified': '2010-09-08 17:17:29', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 6, 'parenttype': 'DocType', 'role': 'HR Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04848', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:44', 'doctype': 'DocField', 'oldfieldname': 'fiscal_year', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Fiscal Year', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04389', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'fiscal_year', 'fieldtype': 'Data', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Column Break', 'creation': '2010-04-01 14:14:44', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04390', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:44', 'doctype': 'DocField', 'oldfieldname': 'is_cheklist_active', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Is IT Cheklist Active?', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04391', 'idx': 4, 'default': 'Yes', 'colour': 'White:FFF', 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'is_cheklist_active', 'fieldtype': 'Select', 'options': 'Yes\nNo', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-04-01 14:14:44', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Employee Information', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04392', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Column Break', 'creation': '2010-04-01 14:14:44', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': '', 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04393', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-04-01 14:14:44', 'doctype': 'DocField', 'oldfieldname': 'employee', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Employee', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04394', 'idx': 7, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'employee', 'fieldtype': 'Link', 'options': 'Employee', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-05-25 10:45:58', 'doctype': 'DocField', 'oldfieldname': 'employee_name', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Employee Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05039', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'employee_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 0, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'hra_count', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'saumil@webnotestech.com', 'label': 'HRA Count', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04395', 'idx': 9, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'hra_count', 'fieldtype': 'Currency', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'metro', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Is location a metro city?', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04396', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'metro', 'fieldtype': 'Select', 'options': '\nYes\nNo', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'sr_citizen', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Is senior citizen?', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04397', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'sr_citizen', 'fieldtype': 'Select', 'options': '\nYes\nNo', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'part_sr_citizen', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Parents are sr. citizen?', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04398', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'part_sr_citizen', 'fieldtype': 'Select', 'options': '\nYes\nNo', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'basic', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Annual Basic', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04399', 'idx': 13, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'basic', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'gross_income', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Annual Gross Income', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'sum of earning terms', 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04400', 'idx': 14, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'gross_income', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Done', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Please fill up all data then press "Done"', 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04401', 'idx': 15, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Column Break', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': '', 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04402', 'idx': 16, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'rent_acc', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Having rented accomodation?', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04403', 'idx': 17, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'rent_acc', 'fieldtype': 'Select', 'options': '\nYes\nNo', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'ann_rent', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Enter annual rent paid', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04404', 'idx': 18, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'ann_rent', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'per_dep_dis', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Dependents Disability %', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Disability % of the Handicapped Dependents', 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04405', 'idx': 19, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'per_dep_dis', 'fieldtype': 'Select', 'options': '\nLess than 80% disability\nMore than 80% disability', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'per_self_dis', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Self disability %', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04406', 'idx': 20, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'per_self_dis', 'fieldtype': 'Select', 'options': '\nLess than 80% disability\nMore than 80% disability', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'pf', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Annual PF', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04407', 'idx': 21, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'pf', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Exemptions', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04408', 'idx': 22, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'HTML', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Exemptions1', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04409', 'idx': 23, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': 'Exemptions under section 10 & 17', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Table', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'exe_declaration_details', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Exemption Detail', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04410', 'idx': 24, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'exe_declaration_details', 'fieldtype': 'Table', 'options': 'Declaration Detail', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Other Income', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04411', 'idx': 25, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Table', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'oth_inc_decl_details', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Other Income Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04412', 'idx': 26, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'oth_inc_decl_details', 'fieldtype': 'Table', 'options': 'Other Income Detail', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': '', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Chapter VI A', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04413', 'idx': 27, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'HTML', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'deduction chap via', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04414', 'idx': 28, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': 'Deduction under Chapter VI A', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Table', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'chap_via_decl_details', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Chap VI A Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04415', 'idx': 29, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'chap_via_decl_details', 'fieldtype': 'Table', 'options': 'Chapter VI A Detail', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': '', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': '80 C', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04416', 'idx': 30, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'HTML', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'investment 80 C', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04417', 'idx': 31, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': 'Investment under Section 80 C & 80CCC qualifying for deduction upto RS. 1 Lac', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Table', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'invest_80_decl_details', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Invest 80 Decl Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04418', 'idx': 32, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'invest_80_decl_details', 'fieldtype': 'Table', 'options': 'Invest 80 Declaration Detail', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': '', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Total Taxable Income', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04419', 'idx': 33, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Section Break', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Calculate', 'width': None, 'trigger': 'Server', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04420', 'idx': 34, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'calculate_tax', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'net_tot_tax_income', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Net Total Taxable Income', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04421', 'idx': 35, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'net_tot_tax_income', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'tax_tot_income', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Tax on Total Income', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04422', 'idx': 36, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'tax_tot_income', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'edu_cess', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Education Cess', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04423', 'idx': 37, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'edu_cess', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'applicable_from', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Applicable from ', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04424', 'idx': 38, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'applicable_from', 'fieldtype': 'Select', 'options': '\nJanuary\nFebruary\nMarch\nApril\nMay\nJune\nJuly\nAugust\nSeptember\nOctober\nNovember\nDecember', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'rem_months', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Remaining month in year', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04425', 'idx': 39, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'rem_months', 'fieldtype': 'Select', 'options': '\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': '', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Calculate Tax', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04426', 'idx': 40, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Section Break', 'options': 'Simple', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': '', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Calculate Monthly Tax ', 'width': '', 'trigger': 'Server', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04427', 'idx': 41, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Button', 'options': 'calc_tax_pm', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'tax_per_month', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Tax per Month', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'IT Checklist', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04428', 'idx': 42, 'default': None, 'colour': None, 'modified': '2010-09-08 17:17:29', 'parenttype': 'DocType', 'fieldname': 'tax_per_month', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/kra_sheet/kra_sheet.txt b/payroll/doctype/kra_sheet/kra_sheet.txt
deleted file mode 100644
index 2de715f628..0000000000
--- a/payroll/doctype/kra_sheet/kra_sheet.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-08-25 16:43:38', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'ashwini@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 6, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'KSHEET.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': None, 'name': 'KRA Sheet', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-08-25 16:43:38', 'doctype': 'DocField', 'oldfieldname': 'kra', 'owner': 'ashwini@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'KRA', 'width': '200px', 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Key Performance Area', 'parent': 'KRA Sheet', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06027', 'idx': 1, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-01 14:13:04', 'parenttype': 'DocType', 'fieldname': 'kra', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-08-25 16:43:38', 'doctype': 'DocField', 'oldfieldname': 'per_weightage', 'owner': 'ashwini@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Weightage (%)', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'KRA Sheet', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06029', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-01 14:13:04', 'parenttype': 'DocType', 'fieldname': 'per_weightage', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/kra_template/kra_template.js b/payroll/doctype/kra_template/kra_template.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/payroll/doctype/kra_template/kra_template.txt b/payroll/doctype/kra_template/kra_template.txt
deleted file mode 100644
index e8514622da..0000000000
--- a/payroll/doctype/kra_template/kra_template.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-08-25 16:41:33', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'ashwini@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 5, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'field:kra_title', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'KRA Template', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01143', 'parent': 'KRA Template', 'read': 1, 'create': 1, 'creation': '2010-08-25 16:41:33', 'modified': '2010-09-20 09:45:51', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01167', 'parent': 'KRA Template', 'read': 1, 'create': 1, 'creation': '2010-09-07 16:44:19', 'modified': '2010-09-20 09:45:51', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'HR Manager', 'owner': 'sneha@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01168', 'parent': 'KRA Template', 'read': 1, 'create': 1, 'creation': '2010-09-07 16:44:19', 'modified': '2010-09-20 09:45:51', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'HR User', 'owner': 'sneha@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01169', 'parent': 'KRA Template', 'read': 1, 'create': 1, 'creation': '2010-09-07 16:44:19', 'modified': '2010-09-20 09:45:51', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 4, 'parenttype': 'DocType', 'role': 'System Manager', 'owner': 'sneha@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-08-25 16:41:33', 'doctype': 'DocField', 'oldfieldname': 'kra_title', 'owner': 'ashwini@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'KRA Title', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'KRA Template', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06024', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 09:45:51', 'parenttype': 'DocType', 'fieldname': 'kra_title', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-08-25 16:41:33', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'KRA Template', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06025', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 09:45:51', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Table', 'creation': '2010-08-25 16:41:33', 'doctype': 'DocField', 'oldfieldname': 'kra_sheet', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'KRA Sheet', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'KRA Template', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06026', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-20 09:45:51', 'parenttype': 'DocType', 'fieldname': 'kra_sheet', 'fieldtype': 'Table', 'options': 'KRA Sheet', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/leave_allocation/leave_allocation.txt b/payroll/doctype/leave_allocation/leave_allocation.txt
deleted file mode 100644
index ad7d0e6311..0000000000
--- a/payroll/doctype/leave_allocation/leave_allocation.txt
+++ /dev/null
@@ -1,637 +0,0 @@
-[
-	{
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'LAL/.#####',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-21 10:01:22',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-02-17 13:47:13',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'Leave Allocation',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'employee,employee_name,leave_type,total_leaves_allocated,fiscal_year',
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 1565
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-02-21 10:01:22',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': 'owner',
-		'modified': '2011-02-17 13:47:13',
-		'modified_by': 'Administrator',
-		'name': 'PERM00731',
-		'owner': 'Administrator',
-		'parent': 'Leave Allocation',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': None,
-		'read': 1,
-		'role': 'HR User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2011-02-21 10:01:22',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': 'owner',
-		'modified': '2011-02-17 13:47:13',
-		'modified_by': 'Administrator',
-		'name': 'PERM00732',
-		'owner': 'Administrator',
-		'parent': 'Leave Allocation',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': None,
-		'read': 1,
-		'role': 'HR User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-02-21 10:01:22',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-02-17 13:47:13',
-		'modified_by': 'Administrator',
-		'name': 'PERM00733',
-		'owner': 'Administrator',
-		'parent': 'Leave Allocation',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2011-02-21 10:01:22',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2011-02-17 13:47:13',
-		'modified_by': 'Administrator',
-		'name': 'PERM00734',
-		'owner': 'Administrator',
-		'parent': 'Leave Allocation',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-15 11:25:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'column_break1',
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-02-17 13:47:13',
-		'modified_by': 'Administrator',
-		'name': 'FL04659',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Allocation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-21 10:01:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'employee',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': 1,
-		'label': 'Employee',
-		'modified': '2011-02-17 13:47:13',
-		'modified_by': 'Administrator',
-		'name': 'FL04152',
-		'no_copy': None,
-		'oldfieldname': 'employee',
-		'oldfieldtype': 'Link',
-		'options': 'Employee',
-		'owner': 'Administrator',
-		'parent': 'Leave Allocation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 13:33:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'employee_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 1,
-		'label': 'Employee Name',
-		'modified': '2011-02-17 13:47:13',
-		'modified_by': 'Administrator',
-		'name': 'FL04767',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Allocation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-21 10:01:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'leave_type',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Leave Type',
-		'modified': '2011-02-17 13:47:13',
-		'modified_by': 'Administrator',
-		'name': 'FL04153',
-		'no_copy': None,
-		'oldfieldname': 'leave_type',
-		'oldfieldtype': 'Link',
-		'options': '\nCasual Leave\nCompensatory Off\nLeave Without Pay\nPaternity Leave\nPrivilege Leave\nSick Leave',
-		'owner': 'Administrator',
-		'parent': 'Leave Allocation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-21 10:01:22',
-		'default': 'Today',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'posting_date',
-		'fieldtype': 'Date',
-		'hidden': 0,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Posting Date',
-		'modified': '2011-02-17 13:47:13',
-		'modified_by': 'Administrator',
-		'name': 'FL04154',
-		'no_copy': 1,
-		'oldfieldname': 'date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Allocation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-21 10:01:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-02-17 13:47:13',
-		'modified_by': 'Administrator',
-		'name': 'FL04155',
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Data',
-		'options': '\n2010-2011\n2011-2012\n2012-2013',
-		'owner': 'Administrator',
-		'parent': 'Leave Allocation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-21 10:01:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Small Text',
-		'hidden': 0,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Description',
-		'modified': '2011-02-17 13:47:13',
-		'modified_by': 'Administrator',
-		'name': 'FL04156',
-		'no_copy': None,
-		'oldfieldname': 'reason',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Allocation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-15 11:25:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'column_break7',
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-02-17 13:47:13',
-		'modified_by': 'Administrator',
-		'name': 'FL04660',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Allocation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-21 10:01:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'carry_forward',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Carry Forward',
-		'modified': '2011-02-17 13:47:13',
-		'modified_by': 'Administrator',
-		'name': 'FL04158',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Allocation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-21 10:01:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'carry_forwarded_leaves',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Carry Forwarded Leaves',
-		'modified': '2011-02-17 13:47:13',
-		'modified_by': 'Administrator',
-		'name': 'FL04159',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Allocation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-21 10:01:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'new_leaves_allocated',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'New Leaves Allocated',
-		'modified': '2011-02-17 13:47:13',
-		'modified_by': 'Administrator',
-		'name': 'FL04160',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Allocation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-21 10:01:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'total_leaves_allocated',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Total Leaves Allocated',
-		'modified': '2011-02-17 13:47:13',
-		'modified_by': 'Administrator',
-		'name': 'FL04161',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Allocation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-21 10:01:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'hidden': 0,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Amended From',
-		'modified': '2011-02-17 13:47:13',
-		'modified_by': 'Administrator',
-		'name': 'FL04162',
-		'no_copy': None,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Allocation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-21 10:01:23',
-		'default': None,
-		'depends_on': None,
-		'description': 'The date at which current entry is corrected in the system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'hidden': 0,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Amendment Date',
-		'modified': '2011-02-17 13:47:13',
-		'modified_by': 'Administrator',
-		'name': 'FL04163',
-		'no_copy': None,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Allocation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/payroll/doctype/leave_applicable_detail/leave_applicable_detail.txt b/payroll/doctype/leave_applicable_detail/leave_applicable_detail.txt
deleted file mode 100644
index 7f50842455..0000000000
--- a/payroll/doctype/leave_applicable_detail/leave_applicable_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:45', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 4, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Leave Applicable Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'select_record', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Select record', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Leave Applicable Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04429', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-04-01 15:16:03', 'parenttype': 'DocType', 'fieldname': 'select_record', 'fieldtype': 'Select', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Int', 'creation': '2010-04-01 14:14:45', 'doctype': 'DocField', 'oldfieldname': 'maxdays', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Days', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Leave Applicable Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04430', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-04-01 15:16:03', 'parenttype': 'DocType', 'fieldname': 'maxdays', 'fieldtype': 'Int', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/leave_application/leave_application.txt b/payroll/doctype/leave_application/leave_application.txt
deleted file mode 100644
index 43158a9826..0000000000
--- a/payroll/doctype/leave_application/leave_application.txt
+++ /dev/null
@@ -1,782 +0,0 @@
-[
-	{
-		'_last_update': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'LAP/.#####',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-21 09:23:54',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Transaction',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-02-17 13:44:37',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'Leave Application',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'employee,employee_name,leave_type,from_date,to_date,total_leave_days,fiscal_year',
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': None,
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': 'From %(employee_name)s, %(designation)s',
-		'tag_fields': 'leave_type',
-		'use_template': None,
-		'version': 18
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-02-21 09:23:55',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': 'owner',
-		'modified': '2011-02-21 09:23:55',
-		'modified_by': 'Administrator',
-		'name': 'PERM00809',
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': None,
-		'read': 1,
-		'role': 'Employee',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2011-02-21 09:23:55',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': 'owner',
-		'modified': '2011-02-21 09:23:55',
-		'modified_by': 'Administrator',
-		'name': 'PERM00810',
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': None,
-		'read': 1,
-		'role': 'Employee',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-02-21 09:23:54',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': 'owner',
-		'modified': '2011-02-21 09:23:54',
-		'modified_by': 'Administrator',
-		'name': 'PERM00799',
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': None,
-		'read': 1,
-		'role': None,
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2011-02-21 09:23:54',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': 'owner',
-		'modified': '2011-02-21 09:23:54',
-		'modified_by': 'Administrator',
-		'name': 'PERM00800',
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': None,
-		'read': 1,
-		'role': None,
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-02-21 09:23:54',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': '',
-		'modified': '2011-02-21 09:23:54',
-		'modified_by': 'Administrator',
-		'name': 'PERM00801',
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-02-21 09:23:54',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2011-02-21 09:23:54',
-		'modified_by': 'Administrator',
-		'name': 'PERM00802',
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2011-02-21 09:23:54',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': '',
-		'modified': '2011-02-21 09:23:54',
-		'modified_by': 'Administrator',
-		'name': 'PERM00803',
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'HR User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2011-02-21 09:23:54',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2011-02-21 09:23:54',
-		'modified_by': 'Administrator',
-		'name': 'PERM00804',
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-21 09:23:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-02-21 09:23:57',
-		'modified_by': 'Administrator',
-		'name': 'FL04650',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-21 09:23:54',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'employee',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': 1,
-		'label': 'Employee',
-		'modified': '2011-02-21 09:23:54',
-		'modified_by': 'Administrator',
-		'name': 'FL04587',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Employee',
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-21 09:23:54',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'employee_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 1,
-		'label': 'Employee Name',
-		'modified': '2011-02-21 09:23:54',
-		'modified_by': 'Administrator',
-		'name': 'FL04588',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-21 09:23:54',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'leave_type',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Leave Type',
-		'modified': '2011-02-21 09:23:54',
-		'modified_by': 'Administrator',
-		'name': 'FL04589',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'link:Leave Type',
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-21 09:23:54',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'leave_balance',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Leave Balance',
-		'modified': '2011-02-21 09:23:54',
-		'modified_by': 'Administrator',
-		'name': 'FL04590',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-21 09:23:54',
-		'default': 'Today',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'posting_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Posting Date',
-		'modified': '2011-02-21 09:23:54',
-		'modified_by': 'Administrator',
-		'name': 'FL04591',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-21 09:23:54',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-02-21 09:23:54',
-		'modified_by': 'Administrator',
-		'name': 'FL04592',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'link:Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-21 09:23:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-02-21 09:23:57',
-		'modified_by': 'Administrator',
-		'name': 'FL04651',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-21 09:23:54',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'half_day',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Half Day',
-		'modified': '2011-02-21 09:23:54',
-		'modified_by': 'Administrator',
-		'name': 'FL04594',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-21 09:23:54',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'from_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'From Date',
-		'modified': '2011-02-21 09:23:54',
-		'modified_by': 'Administrator',
-		'name': 'FL04595',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-21 09:23:54',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'to_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'To Date',
-		'modified': '2011-02-21 09:23:54',
-		'modified_by': 'Administrator',
-		'name': 'FL04596',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-21 09:23:54',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'total_leave_days',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Total Leave Days',
-		'modified': '2011-02-21 09:23:54',
-		'modified_by': 'Administrator',
-		'name': 'FL04597',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-21 09:23:54',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Description',
-		'modified': '2011-02-21 09:23:54',
-		'modified_by': 'Administrator',
-		'name': 'FL04598',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '300px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-21 09:23:54',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Amended From',
-		'modified': '2011-02-21 09:23:54',
-		'modified_by': 'Administrator',
-		'name': 'FL04599',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-21 09:23:54',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Amendment Date',
-		'modified': '2011-02-21 09:23:54',
-		'modified_by': 'Administrator',
-		'name': 'FL04600',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Application',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/payroll/doctype/leave_control_panel/leave_control_panel.txt b/payroll/doctype/leave_control_panel/leave_control_panel.txt
deleted file mode 100644
index 9d01e88d7d..0000000000
--- a/payroll/doctype/leave_control_panel/leave_control_panel.txt
+++ /dev/null
@@ -1,613 +0,0 @@
-[
-	{
-		'allow_attach': None,
-		'allow_copy': 1,
-		'allow_email': 1,
-		'allow_print': 1,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:08',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': 0,
-		'hide_toolbar': 0,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': 1,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-02-12 15:42:00',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'Leave Control Panel',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': 1,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 161
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-08-08 17:09:08',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-02-12 15:42:00',
-		'modified_by': 'Administrator',
-		'name': 'PERM00320',
-		'owner': 'Administrator',
-		'parent': 'Leave Control Panel',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:08',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-02-12 15:42:00',
-		'modified_by': 'Administrator',
-		'name': 'PERM00321',
-		'owner': 'Administrator',
-		'parent': 'Leave Control Panel',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-08-08 17:09:08',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-02-12 15:42:00',
-		'modified_by': 'Administrator',
-		'name': 'PERM00322',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Leave Control Panel',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR User',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-08-08 17:09:08',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2011-02-12 15:42:00',
-		'modified_by': 'Administrator',
-		'name': 'PERM00323',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Leave Control Panel',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:08',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2011-02-12 15:42:00',
-		'modified_by': 'Administrator',
-		'name': 'PERM00324',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Leave Control Panel',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'HR User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:08',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2011-02-12 15:42:00',
-		'modified_by': 'Administrator',
-		'name': 'PERM00325',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Leave Control Panel',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-10-06 17:45:32',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'col_brk4',
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-02-12 15:42:00',
-		'modified_by': 'Administrator',
-		'name': 'FL03972',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Control Panel',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:08',
-		'default': None,
-		'depends_on': None,
-		'description': 'Leave blank if considered for all employee types',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'employee_type',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Employee Type',
-		'modified': '2011-02-12 15:42:00',
-		'modified_by': 'Administrator',
-		'name': 'FL01835',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'link:Employment Type',
-		'owner': 'Administrator',
-		'parent': 'Leave Control Panel',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:08',
-		'default': None,
-		'depends_on': None,
-		'description': 'Leave blank if considered for all branches',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'branch',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Branch',
-		'modified': '2011-02-12 15:42:00',
-		'modified_by': 'Administrator',
-		'name': 'FL01836',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'link:Branch',
-		'owner': 'Administrator',
-		'parent': 'Leave Control Panel',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:08',
-		'default': None,
-		'depends_on': None,
-		'description': 'Leave blank if considered for all departments',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'department',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Department',
-		'modified': '2011-02-12 15:42:00',
-		'modified_by': 'Administrator',
-		'name': 'FL01837',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'link:Department',
-		'owner': 'Administrator',
-		'parent': 'Leave Control Panel',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:08',
-		'default': None,
-		'depends_on': None,
-		'description': 'Leave blank if considered for all designations',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'designation',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Designation',
-		'modified': '2011-02-12 15:42:00',
-		'modified_by': 'Administrator',
-		'name': 'FL01838',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'link:Designation',
-		'owner': 'Administrator',
-		'parent': 'Leave Control Panel',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:08',
-		'default': None,
-		'depends_on': None,
-		'description': 'Leave blank if considered for all grades',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'grade',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Grade',
-		'modified': '2011-02-12 15:42:00',
-		'modified_by': 'Administrator',
-		'name': 'FL01839',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'link:Grade',
-		'owner': 'Administrator',
-		'parent': 'Leave Control Panel',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-10-06 17:45:32',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'col_brk1',
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-02-12 15:42:00',
-		'modified_by': 'Administrator',
-		'name': 'FL03973',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Control Panel',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-02-12 15:42:00',
-		'modified_by': 'Administrator',
-		'name': 'FL01841',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'link:Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'Leave Control Panel',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'leave_type',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Leave Type',
-		'modified': '2011-02-12 15:42:00',
-		'modified_by': 'Administrator',
-		'name': 'FL01843',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'link:Leave Type',
-		'owner': 'Administrator',
-		'parent': 'Leave Control Panel',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-12 14:41:36',
-		'default': None,
-		'depends_on': None,
-		'description': "Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year",
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'carry_forward',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Carry Forward',
-		'modified': '2011-02-12 15:42:00',
-		'modified_by': 'Administrator',
-		'name': 'FL04509',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Control Panel',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'no_of_days',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'New Leaves Allocated (In Days)',
-		'modified': '2011-02-12 15:42:00',
-		'modified_by': 'Administrator',
-		'name': 'FL01848',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Control Panel',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Allocate',
-		'modified': '2011-02-12 15:42:00',
-		'modified_by': 'Administrator',
-		'name': 'FL01849',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'allocate_leave',
-		'owner': 'Administrator',
-		'parent': 'Leave Control Panel',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Server',
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/payroll/doctype/leave_detail/leave_detail.txt b/payroll/doctype/leave_detail/leave_detail.txt
deleted file mode 100644
index a773182d83..0000000000
--- a/payroll/doctype/leave_detail/leave_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:46', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 9, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Leave Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00738', 'parent': 'Leave Detail', 'read': 1, 'create': 1, 'creation': '2010-04-01 14:14:46', 'modified': '2010-04-01 15:16:45', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'All', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:46', 'doctype': 'DocField', 'oldfieldname': 'leave_type', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Leave Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Leave Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04449', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-04-01 15:16:45', 'parenttype': 'DocType', 'fieldname': 'leave_type', 'fieldtype': 'Data', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:46', 'doctype': 'DocField', 'oldfieldname': 'balance', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Balance', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Leave Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04450', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-04-01 15:16:45', 'parenttype': 'DocType', 'fieldname': 'balance', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/leave_type/leave_type.js b/payroll/doctype/leave_type/leave_type.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/payroll/doctype/leave_type/leave_type.txt b/payroll/doctype/leave_type/leave_type.txt
deleted file mode 100644
index d1083307e1..0000000000
--- a/payroll/doctype/leave_type/leave_type.txt
+++ /dev/null
@@ -1,334 +0,0 @@
-[
-	{
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': 1,
-		'autoname': 'field:leave_type_name',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:08',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-02-10 17:05:15',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'Leave Type',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 23
-	},
-	{
-		'amend': None,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:08',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-02-10 17:05:15',
-		'modified_by': 'Administrator',
-		'name': 'PERM00333',
-		'owner': 'Administrator',
-		'parent': 'Leave Type',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:08',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-02-10 17:05:15',
-		'modified_by': 'Administrator',
-		'name': 'PERM00334',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Leave Type',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR User',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:08',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-02-10 17:05:15',
-		'modified_by': 'Administrator',
-		'name': 'PERM00335',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Leave Type',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'trash_reason',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Trash Reason',
-		'modified': '2011-02-10 17:05:15',
-		'modified_by': 'Administrator',
-		'name': 'FL01875',
-		'no_copy': None,
-		'oldfieldname': 'trash_reason',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Type',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'leave_type_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Leave Type Name',
-		'modified': '2011-02-10 17:05:15',
-		'modified_by': 'Administrator',
-		'name': 'FL01876',
-		'no_copy': None,
-		'oldfieldname': 'leave_type_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Type',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'max_days_allowed',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Max Days Leave Allowed',
-		'modified': '2011-02-10 17:05:15',
-		'modified_by': 'Administrator',
-		'name': 'FL01877',
-		'no_copy': None,
-		'oldfieldname': 'max_days_allowed',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Type',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_carry_forward',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Is Carry Forward',
-		'modified': '2011-02-10 17:05:15',
-		'modified_by': 'Administrator',
-		'name': 'FL01878',
-		'no_copy': None,
-		'oldfieldname': 'is_carry_forward',
-		'oldfieldtype': 'Check',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Type',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_encash',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Is Encash',
-		'modified': '2011-02-10 17:05:15',
-		'modified_by': 'Administrator',
-		'name': 'FL01879',
-		'no_copy': None,
-		'oldfieldname': 'is_encash',
-		'oldfieldtype': 'Check',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Type',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-10 17:05:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_lwp',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Is LWP',
-		'modified': '2011-02-10 17:05:15',
-		'modified_by': 'Administrator',
-		'name': 'FL04474',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Leave Type',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/payroll/doctype/leave_type_detail/leave_type_detail.txt b/payroll/doctype/leave_type_detail/leave_type_detail.txt
deleted file mode 100644
index c8dbefaf6e..0000000000
--- a/payroll/doctype/leave_type_detail/leave_type_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:46', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 3, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Leave Type Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Int', 'creation': '2010-04-01 14:14:46', 'doctype': 'DocField', 'oldfieldname': 'days', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Days', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Leave Type Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04477', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-04-01 15:17:46', 'parenttype': 'DocType', 'fieldname': 'days', 'fieldtype': 'Int', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:46', 'doctype': 'DocField', 'oldfieldname': 'year', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Year', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Leave Type Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04478', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-04-01 15:17:46', 'parenttype': 'DocType', 'fieldname': 'year', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/other_income_detail/other_income_detail.txt b/payroll/doctype/other_income_detail/other_income_detail.txt
deleted file mode 100644
index 9e25d697e1..0000000000
--- a/payroll/doctype/other_income_detail/other_income_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:46', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 6, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Other Income Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00742', 'parent': 'Other Income Detail', 'read': 1, 'create': None, 'creation': '2010-04-01 14:14:46', 'modified': '2010-04-01 15:18:08', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00743', 'parent': 'Other Income Detail', 'read': 1, 'create': None, 'creation': '2010-04-01 14:14:46', 'modified': '2010-04-01 15:18:08', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-01 14:14:46', 'doctype': 'DocField', 'oldfieldname': 'particulars2', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Particulars', 'width': '200px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Other Income Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04479', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-04-01 15:18:08', 'parenttype': 'DocType', 'fieldname': 'particulars2', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:46', 'doctype': 'DocField', 'oldfieldname': 'under_section2', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Under Section', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Other Income Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04480', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-04-01 15:18:08', 'parenttype': 'DocType', 'fieldname': 'under_section2', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:46', 'doctype': 'DocField', 'oldfieldname': 'max_limit2', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Max. Limit', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Other Income Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04481', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-04-01 15:18:08', 'parenttype': 'DocType', 'fieldname': 'max_limit2', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:46', 'doctype': 'DocField', 'oldfieldname': 'actual_amount2', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Actual Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Other Income Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04482', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-04-01 15:18:08', 'parenttype': 'DocType', 'fieldname': 'actual_amount2', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:46', 'doctype': 'DocField', 'oldfieldname': 'eligible_amount2', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Eligible Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Other Income Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04483', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-04-01 15:18:08', 'parenttype': 'DocType', 'fieldname': 'eligible_amount2', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:46', 'doctype': 'DocField', 'oldfieldname': 'modified_amount2', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Modified Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Other Income Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04484', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-04-01 15:18:08', 'parenttype': 'DocType', 'fieldname': 'modified_amount2', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/previous_experience_detail/previous_experience_detail.txt b/payroll/doctype/previous_experience_detail/previous_experience_detail.txt
deleted file mode 100644
index 73ec5e885c..0000000000
--- a/payroll/doctype/previous_experience_detail/previous_experience_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:47', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 3, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': None, 'name': 'Previous Experience Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00745', 'parent': 'Previous Experience Detail', 'read': 1, 'create': 1, 'creation': '2010-04-01 14:14:47', 'modified': '2010-05-25 15:09:13', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'All', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': 'company_name', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Company', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Previous Experience Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04503', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-05-25 15:09:13', 'parenttype': 'DocType', 'fieldname': 'company_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': 'designation', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Designation', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Previous Experience Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04504', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-05-25 15:09:13', 'parenttype': 'DocType', 'fieldname': 'designation', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': 'salary', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Salary', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Previous Experience Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04505', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-05-25 15:09:13', 'parenttype': 'DocType', 'fieldname': 'salary', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-05-25 15:09:13', 'doctype': 'DocField', 'oldfieldname': 'address', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Address', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Previous Experience Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05051', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-05-25 15:09:13', 'parenttype': 'DocType', 'fieldname': 'address', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': 'contact', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Contact', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Previous Experience Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04507', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-05-25 15:09:13', 'parenttype': 'DocType', 'fieldname': 'contact', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': 'total_experience', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Total Experience', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Previous Experience Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04508', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-05-25 15:09:13', 'parenttype': 'DocType', 'fieldname': 'total_experience', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/professional_training_details/professional_training_details.txt b/payroll/doctype/professional_training_details/professional_training_details.txt
deleted file mode 100644
index ce61bf339a..0000000000
--- a/payroll/doctype/professional_training_details/professional_training_details.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:47', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 5, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': None, 'name': 'Professional Training Details', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-05-25 15:08:04', 'doctype': 'DocField', 'oldfieldname': 'institute', 'owner': 'harshada@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Institute / Conducted By', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Professional Training Details', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05050', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-05-25 15:08:04', 'parenttype': 'DocType', 'fieldname': 'institute', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-05-25 15:08:04', 'doctype': 'DocField', 'oldfieldname': 'nature_of_training', 'owner': 'harshada@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Program / Seminar Title', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Professional Training Details', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05049', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-05-25 15:08:04', 'parenttype': 'DocType', 'fieldname': 'nature_of_training', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': 'duration', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Duration', 'width': '', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Professional Training Details', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04511', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-05-25 15:08:04', 'parenttype': 'DocType', 'fieldname': 'duration', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': 'loc', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Location', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Professional Training Details', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04512', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-05-25 15:08:04', 'parenttype': 'DocType', 'fieldname': 'loc', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-05-25 15:08:04', 'doctype': 'DocField', 'oldfieldname': 'certificate', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Certificate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Professional Training Details', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05048', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-05-25 15:08:04', 'parenttype': 'DocType', 'fieldname': 'certificate', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/rule_engine/rule_engine.txt b/payroll/doctype/rule_engine/rule_engine.txt
deleted file mode 100644
index 51a3e9f713..0000000000
--- a/payroll/doctype/rule_engine/rule_engine.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:47', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 1, 'read_only': 0, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 206, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': '', 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Rule Engine', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': '', 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00746', 'parent': 'Rule Engine', 'read': 1, 'create': 1, 'creation': '2010-04-01 14:14:47', 'modified': '2010-04-01 15:19:35', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}]
\ No newline at end of file
diff --git a/payroll/doctype/salary_slip/salary_slip.txt b/payroll/doctype/salary_slip/salary_slip.txt
deleted file mode 100644
index 367701600a..0000000000
--- a/payroll/doctype/salary_slip/salary_slip.txt
+++ /dev/null
@@ -1,1754 +0,0 @@
-[
-	{
-		'_last_update': '1308808105',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:20',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'Salary Slip',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': 'For %(employee_name)s, %(designation)s',
-		'tag_fields': None,
-		'use_template': None,
-		'version': 388
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2011-02-14 11:35:30',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': 'owner',
-		'modified': '2011-02-14 11:35:30',
-		'modified_by': 'Administrator',
-		'name': 'PERM00811',
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': None,
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2011-02-14 11:35:30',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': 'owner',
-		'modified': '2011-02-14 11:35:30',
-		'modified_by': 'Administrator',
-		'name': 'PERM00812',
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': None,
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2011-02-14 11:38:07',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': 'owner',
-		'modified': '2011-02-14 11:38:07',
-		'modified_by': 'Administrator',
-		'name': 'PERM00817',
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': None,
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2011-02-14 11:38:07',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': 'owner',
-		'modified': '2011-02-14 11:38:07',
-		'modified_by': 'Administrator',
-		'name': 'PERM00818',
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': None,
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-08-08 17:09:20',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2010-08-08 17:09:20',
-		'modified_by': 'Administrator',
-		'name': 'PERM00455',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Slip',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:20',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2010-08-08 17:09:20',
-		'modified_by': 'Administrator',
-		'name': 'PERM00456',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Slip',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:20',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2010-08-08 17:09:20',
-		'modified_by': 'Administrator',
-		'name': 'PERM00457',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Slip',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'HR User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:20',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2010-08-08 17:09:20',
-		'modified_by': 'Administrator',
-		'name': 'PERM00458',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Slip',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Basic Info',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL05707',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL05708',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'employee',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 1,
-		'label': 'Employee',
-		'modified': '2011-06-27 14:39:15',
-		'modified_by': 'Administrator',
-		'name': 'FL02891',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'employee',
-		'oldfieldtype': 'Link',
-		'options': 'Employee',
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'employee_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Employee Name',
-		'modified': '2011-06-27 14:39:15',
-		'modified_by': 'Administrator',
-		'name': 'FL02893',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'employee_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'department',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': 1,
-		'label': 'Department',
-		'modified': '2011-06-27 14:39:15',
-		'modified_by': 'Administrator',
-		'name': 'FL02894',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'department',
-		'oldfieldtype': 'Link',
-		'options': 'Department',
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'designation',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': 1,
-		'label': 'Designation',
-		'modified': '2011-06-27 14:39:15',
-		'modified_by': 'Administrator',
-		'name': 'FL02895',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'designation',
-		'oldfieldtype': 'Link',
-		'options': 'Designation',
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'branch',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': 1,
-		'label': 'Branch',
-		'modified': '2011-06-27 14:39:15',
-		'modified_by': 'Administrator',
-		'name': 'FL02896',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'branch',
-		'oldfieldtype': 'Link',
-		'options': 'Branch',
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'grade',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': 1,
-		'label': 'Grade',
-		'modified': '2011-06-27 14:39:15',
-		'modified_by': 'Administrator',
-		'name': 'FL02897',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'grade',
-		'oldfieldtype': 'Link',
-		'options': 'Grade',
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'pf_no',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'PF No.',
-		'modified': '2011-06-27 14:39:15',
-		'modified_by': 'Administrator',
-		'name': 'FL02898',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'pf_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'esic_no',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'ESIC No.',
-		'modified': '2011-06-27 14:39:15',
-		'modified_by': 'Administrator',
-		'name': 'FL02899',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'esic_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:13',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'letter_head',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Letter Head',
-		'modified': '2011-06-27 14:39:13',
-		'modified_by': 'Administrator',
-		'name': 'FL05672',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Letter Head',
-		'owner': 'sanjeeva@vencesystem.com',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'letter_head',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Letter Head',
-		'modified': '2011-06-27 14:39:15',
-		'modified_by': 'Administrator',
-		'name': 'FL05687',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Letter Head',
-		'owner': 'sanjeeva@vencesystem.com',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'letter_head',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Letter Head',
-		'modified': '2011-06-27 14:39:15',
-		'modified_by': 'Administrator',
-		'name': 'FL05702',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Letter Head',
-		'owner': 'sanjeeva@vencesystem.com',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL05709',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-06-27 14:39:15',
-		'modified_by': 'Administrator',
-		'name': 'FL02884',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Data',
-		'options': 'Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:13',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-06-27 14:39:13',
-		'modified_by': 'Administrator',
-		'name': 'FL05674',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Link:Company',
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-06-27 14:39:15',
-		'modified_by': 'Administrator',
-		'name': 'FL05689',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Link:Company',
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-06-27 14:39:15',
-		'modified_by': 'Administrator',
-		'name': 'FL05704',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Link:Company',
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'month',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': 1,
-		'label': 'Month',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL02886',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'month',
-		'oldfieldtype': 'Select',
-		'options': '\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12',
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': '37%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'total_days_in_month',
-		'fieldtype': 'Int',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': 'Total days in month',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL02903',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'total_days_in_month',
-		'oldfieldtype': 'Int',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'leave_without_pay',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Leave Without Pay',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL02904',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'leave_without_pay',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'payment_days',
-		'fieldtype': 'Float',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Payment days',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL02907',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'payment_days',
-		'oldfieldtype': 'Float',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'bank_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Bank Name',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL02905',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'bank_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'bank_account_no',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'Bank Account No.',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL02906',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'bank_account_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'email_check',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
-		'label': 'Email',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL02908',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'email_check',
-		'oldfieldtype': 'Check',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'hidden': 0,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
-		'label': 'Amended From',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL02901',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 0,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'hidden': 0,
-		'icon': None,
-		'idx': 23,
-		'in_filter': None,
-		'label': 'Amendment Date',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL02902',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 0,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 24,
-		'in_filter': None,
-		'label': 'Earning & Deduction',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL05710',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-27 14:39:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 25,
-		'in_filter': None,
-		'label': 'Earning',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL05711',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'earning_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 26,
-		'in_filter': None,
-		'label': 'Earning Details',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL02914',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'earning_details',
-		'oldfieldtype': 'Table',
-		'options': 'SS Earning Detail',
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-27 14:39:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 27,
-		'in_filter': None,
-		'label': 'Deduction',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL05712',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'deduction_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 28,
-		'in_filter': None,
-		'label': 'Deduction Details',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL02917',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'deduction_details',
-		'oldfieldtype': 'Table',
-		'options': 'SS Deduction Detail',
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 29,
-		'in_filter': None,
-		'label': 'Totals',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL05713',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 30,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL05714',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'arrear_amount',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 31,
-		'in_filter': None,
-		'label': 'Arrear Amount',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL02909',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'arrear_amount',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-14 10:34:35',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'leave_encashment_amount',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 32,
-		'in_filter': None,
-		'label': 'Leave Encashment Amount',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL04586',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'encashment_amount',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'gross_pay',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 33,
-		'in_filter': None,
-		'label': 'Gross Pay',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL02920',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'gross_pay',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'total_deduction',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 34,
-		'in_filter': None,
-		'label': 'Total Deduction',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL02922',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'total_deduction',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 35,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL05715',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:20',
-		'default': None,
-		'depends_on': None,
-		'description': 'Gross Pay + Arrear Amount +Encashment Amount - Total Deduction',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'net_pay',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 36,
-		'in_filter': None,
-		'label': 'Net Pay',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': 'FL02924',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'net_pay',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 09:24:46',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'rounded_total',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 37,
-		'in_filter': None,
-		'label': 'Rounded Total',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': '000001892',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 09:24:46',
-		'default': None,
-		'depends_on': None,
-		'description': 'Net Pay (in words) will be visible once you save the Salary Slip.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'total_in_words',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 38,
-		'in_filter': None,
-		'label': 'Total in words',
-		'modified': '2011-06-27 14:39:16',
-		'modified_by': 'Administrator',
-		'name': '000001893',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'net_pay_in_words',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Slip',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/payroll/doctype/salary_slip_control_panel/salary_slip_control_panel.txt b/payroll/doctype/salary_slip_control_panel/salary_slip_control_panel.txt
deleted file mode 100644
index 96f7ce53a4..0000000000
--- a/payroll/doctype/salary_slip_control_panel/salary_slip_control_panel.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:48', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 0, 'read_only': 1, 'allow_email': 1, 'dt_template': None, 'hide_heading': 0, 'issingle': 1, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 125, 'menu_index': None, 'docstatus': 0, 'allow_copy': 1, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': 1, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': 0, 'modified_by': 'harshada@webnotestech.com', 'document_type': '', 'name': 'Salary Slip Control Panel', 'idx': None, 'hide_toolbar': 0, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-10-05 11:18:58', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00749', 'parent': 'Salary Slip Control Panel', 'read': 1, 'create': 1, 'creation': '2010-04-01 14:14:48', 'modified': '2010-10-05 11:18:58', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00787', 'parent': 'Salary Slip Control Panel', 'read': 1, 'create': 1, 'creation': '2010-04-19 09:50:52', 'modified': '2010-10-05 11:18:58', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'HR User', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00788', 'parent': 'Salary Slip Control Panel', 'read': 1, 'create': 1, 'creation': '2010-04-19 09:50:52', 'modified': '2010-10-05 11:18:58', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'HR Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-05-27 13:24:36', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Salary Slip Control Panel', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Salary Slip Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05090', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-10-05 11:18:58', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:48', 'doctype': 'DocField', 'oldfieldname': 'employee_type', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Employment Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Salary Slip Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04555', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-10-05 11:18:58', 'parenttype': 'DocType', 'fieldname': 'employee_type', 'fieldtype': 'Select', 'options': 'link:Employment Type', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:48', 'doctype': 'DocField', 'oldfieldname': 'grade', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Grade', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Salary Slip Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04556', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-10-05 11:18:58', 'parenttype': 'DocType', 'fieldname': 'grade', 'fieldtype': 'Select', 'options': 'link:Grade', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:48', 'doctype': 'DocField', 'oldfieldname': 'branch', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Branch', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Salary Slip Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04557', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-10-05 11:18:58', 'parenttype': 'DocType', 'fieldname': 'branch', 'fieldtype': 'Select', 'options': 'link:Branch', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:48', 'doctype': 'DocField', 'oldfieldname': 'department', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Department', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Salary Slip Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04558', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-10-05 11:18:58', 'parenttype': 'DocType', 'fieldname': 'department', 'fieldtype': 'Select', 'options': 'link:Department', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:48', 'doctype': 'DocField', 'oldfieldname': 'designation', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Designation', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Salary Slip Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04559', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-10-05 11:18:58', 'parenttype': 'DocType', 'fieldname': 'designation', 'fieldtype': 'Select', 'options': 'link:Designation', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Column Break', 'creation': '2010-04-01 14:14:48', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': '', 'width': '', 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Salary Slip Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04560', 'idx': 7, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-05 11:18:58', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:48', 'doctype': 'DocField', 'oldfieldname': 'fiscal_year', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Fiscal Year', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Salary Slip Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04561', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-10-05 11:18:58', 'parenttype': 'DocType', 'fieldname': 'fiscal_year', 'fieldtype': 'Select', 'options': 'link:Fiscal Year', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:49', 'doctype': 'DocField', 'oldfieldname': 'month', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Month', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Salary Slip Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04562', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-10-05 11:18:58', 'parenttype': 'DocType', 'fieldname': 'month', 'fieldtype': 'Select', 'options': '\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:49', 'doctype': 'DocField', 'oldfieldname': 'year', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Year', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Salary Slip Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04563', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-10-05 11:18:58', 'parenttype': 'DocType', 'fieldname': 'year', 'fieldtype': 'Select', 'options': '\n2009\n2010\n2011\n2012', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:49', 'doctype': 'DocField', 'oldfieldname': 'week_off', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Week Off', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Salary Slip Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04564', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-10-05 11:18:58', 'parenttype': 'DocType', 'fieldname': 'week_off', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-04-01 14:14:49', 'doctype': 'DocField', 'oldfieldname': 'arrear_amount', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Arrear Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Salary Slip Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04565', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-10-05 11:18:58', 'parenttype': 'DocType', 'fieldname': 'arrear_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Check', 'creation': '2010-04-01 14:14:49', 'doctype': 'DocField', 'oldfieldname': 'email_check', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Email', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Salary Slip Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04567', 'idx': 13, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-05 11:18:58', 'parenttype': 'DocType', 'fieldname': 'email_check', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-04-01 14:14:49', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Salary Slip Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04566', 'idx': 14, 'default': None, 'colour': None, 'modified': '2010-10-05 11:18:58', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2010-04-01 14:14:49', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Process Payroll', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Salary Slip Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04568', 'idx': 15, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-05 11:18:58', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-05-27 14:29:57', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Salary Slip HTML', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Salary Slip Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05091', 'idx': 16, 'default': None, 'colour': None, 'modified': '2010-10-05 11:18:58', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'HTML', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-06-02 13:28:16', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Salary Slip Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05219', 'idx': 17, 'default': None, 'colour': None, 'modified': '2010-10-05 11:18:58', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2010-04-05 12:15:40', 'doctype': 'DocField', 'oldfieldname': '', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Submit Salary Slip', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Salary Slip Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04626', 'idx': 18, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-05 11:18:58', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Button', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-10-04 14:46:03', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Make Bank Voucher', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Salary Slip Control Panel', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06193', 'idx': 19, 'default': None, 'colour': None, 'modified': '2010-10-05 11:18:58', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/payroll/doctype/salary_structure/salary_structure.txt b/payroll/doctype/salary_structure/salary_structure.txt
deleted file mode 100644
index 71b36647c6..0000000000
--- a/payroll/doctype/salary_structure/salary_structure.txt
+++ /dev/null
@@ -1,1188 +0,0 @@
-[
-	{
-		'_last_update': '1308808105',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-12-14 16:50:05',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'Salary Structure',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': 'For %(employee_name)s',
-		'tag_fields': None,
-		'use_template': None,
-		'version': 586
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2011-02-14 11:38:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': 'owner',
-		'modified': '2011-02-14 11:38:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00816',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': None,
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2011-02-14 11:38:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': 'owner',
-		'modified': '2011-02-14 11:38:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00815',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': None,
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2011-02-14 10:34:34',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': 'owner',
-		'modified': '2011-02-14 10:34:34',
-		'modified_by': 'Administrator',
-		'name': 'PERM00810',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': None,
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2011-02-14 10:34:34',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': 'owner',
-		'modified': '2011-02-14 10:34:34',
-		'modified_by': 'Administrator',
-		'name': 'PERM00809',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': None,
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2011-01-25 12:33:10',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': None,
-		'modified': '2011-01-25 12:33:10',
-		'modified_by': 'umair@iwebnotes.com',
-		'name': 'PERM00793',
-		'owner': 'umair@iwebnotes.com',
-		'parent': 'Salary Structure',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': None,
-		'role': 'Sales User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-12-14 16:50:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2010-12-14 16:50:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00764',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'All',
-		'submit': None,
-		'write': 0
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-12-14 16:50:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2010-12-14 16:50:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00765',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR User',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-12-14 16:50:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2010-12-14 16:50:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00766',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-12-14 16:50:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2010-12-14 16:50:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00767',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-12-14 16:50:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2010-12-14 16:50:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00768',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'HR User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Basic Info',
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL05662',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'basic_info',
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL05663',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-12-14 16:50:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'employee',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 1,
-		'label': 'Employee',
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL04302',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'employee',
-		'oldfieldtype': 'Link',
-		'options': 'Employee',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 16:50:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'employee_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Employee Name',
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL04304',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'employee_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-12-14 16:50:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'branch',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': 1,
-		'label': 'Branch',
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL04305',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'branch',
-		'oldfieldtype': 'Select',
-		'options': 'link:Branch',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-12-14 16:50:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'designation',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': 1,
-		'label': 'Designation',
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL04306',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'designation',
-		'oldfieldtype': 'Select',
-		'options': 'link:Designation',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-12-14 16:50:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'department',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': 1,
-		'label': 'Department',
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL04307',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'department',
-		'oldfieldtype': 'Select',
-		'options': 'link:Department',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-12-14 16:50:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'grade',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': 1,
-		'label': 'Grade',
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL04308',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'grade',
-		'oldfieldtype': 'Select',
-		'options': 'link:Grade',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL05664',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-12-14 16:50:05',
-		'default': 'Yes',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_active',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': 1,
-		'label': 'Is Active',
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL04311',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'is_active',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 16:50:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'from_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'From Date',
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL04313',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'from_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 16:50:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'to_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'To Date',
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL04314',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'to_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-12-14 16:50:06',
-		'default': None,
-		'depends_on': None,
-		'description': 'Cost to Company',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'ctc',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': 1,
-		'label': 'CTC',
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL04315',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'ctc',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL05658',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Link:Company',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:11',
-		'default': None,
-		'depends_on': None,
-		'description': 'You can create more earning and deduction type from Setup --> HR',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Earning & Deduction',
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL05665',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'earning_deduction',
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-27 14:39:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': 0,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': 'Earning',
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL05666',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'col_brk2',
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-12-14 16:50:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'earning_details',
-		'fieldtype': 'Table',
-		'hidden': 0,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Earning1',
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL04319',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'earning_details',
-		'oldfieldtype': 'Table',
-		'options': 'Earning Detail',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-27 14:39:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': 0,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Deduction',
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL05667',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'col_brk3',
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-12-14 16:50:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'deduction_details',
-		'fieldtype': 'Table',
-		'hidden': 0,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Deduction1',
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL04324',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'deduction_details',
-		'oldfieldtype': 'Table',
-		'options': 'Deduction Detail',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL05668',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Simple',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL05669',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 16:50:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'total_earning',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
-		'label': 'Total Earning',
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL04327',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'total_earning',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 16:50:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'total_deduction',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': None,
-		'label': 'Total Deduction',
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL04334',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'total_deduction',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-27 14:39:11',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 24,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL05670',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-14 10:34:31',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'net_pay',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 25,
-		'in_filter': None,
-		'label': 'Net Pay',
-		'modified': '2011-06-27 14:39:11',
-		'modified_by': 'Administrator',
-		'name': 'FL04572',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Salary Structure',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/payroll/doctype/ss_deduction_detail/ss_deduction_detail.txt b/payroll/doctype/ss_deduction_detail/ss_deduction_detail.txt
deleted file mode 100644
index 67d6a41679..0000000000
--- a/payroll/doctype/ss_deduction_detail/ss_deduction_detail.txt
+++ /dev/null
@@ -1,218 +0,0 @@
-[
-	{
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:24',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': 1,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-02-12 18:24:31',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'SS Deduction Detail',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 17
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-08-08 17:09:24',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-02-12 18:24:31',
-		'modified_by': 'Administrator',
-		'name': 'PERM00536',
-		'owner': 'Administrator',
-		'parent': 'SS Deduction Detail',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:24',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'd_type',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Type',
-		'modified': '2011-02-12 18:24:31',
-		'modified_by': 'Administrator',
-		'name': 'FL03360',
-		'no_copy': None,
-		'oldfieldname': 'd_type',
-		'oldfieldtype': 'Data',
-		'options': 'Deduction Type',
-		'owner': 'Administrator',
-		'parent': 'SS Deduction Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '200px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:24',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'd_amount',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Amount',
-		'modified': '2011-02-12 18:24:31',
-		'modified_by': 'Administrator',
-		'name': 'FL03361',
-		'no_copy': None,
-		'oldfieldname': 'd_amount',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'SS Deduction Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-10 15:56:26',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'd_modified_amount',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Modified Amount',
-		'modified': '2011-02-12 18:24:31',
-		'modified_by': 'Administrator',
-		'name': 'FL04467',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'SS Deduction Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-11 12:50:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'd_depends_on_lwp',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Depends on LWP',
-		'modified': '2011-02-12 18:24:31',
-		'modified_by': 'Administrator',
-		'name': 'FL04469',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'SS Deduction Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/payroll/doctype/ss_earning_detail/ss_earning_detail.txt b/payroll/doctype/ss_earning_detail/ss_earning_detail.txt
deleted file mode 100644
index c126a293f2..0000000000
--- a/payroll/doctype/ss_earning_detail/ss_earning_detail.txt
+++ /dev/null
@@ -1,218 +0,0 @@
-[
-	{
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:24',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': 1,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-02-12 18:24:20',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'SS Earning Detail',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 17
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-08-08 17:09:24',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-02-12 18:24:20',
-		'modified_by': 'Administrator',
-		'name': 'PERM00537',
-		'owner': 'Administrator',
-		'parent': 'SS Earning Detail',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:24',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'e_type',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Type',
-		'modified': '2011-02-12 18:24:20',
-		'modified_by': 'Administrator',
-		'name': 'FL03362',
-		'no_copy': None,
-		'oldfieldname': 'e_type',
-		'oldfieldtype': 'Data',
-		'options': 'Earning Type',
-		'owner': 'Administrator',
-		'parent': 'SS Earning Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '200px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:24',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'e_amount',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Amount',
-		'modified': '2011-02-12 18:24:20',
-		'modified_by': 'Administrator',
-		'name': 'FL03363',
-		'no_copy': None,
-		'oldfieldname': 'e_amount',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'SS Earning Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-10 15:55:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'e_modified_amount',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Modified Amount',
-		'modified': '2011-02-12 18:24:20',
-		'modified_by': 'Administrator',
-		'name': 'FL04466',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'SS Earning Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-11 12:49:47',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'e_depends_on_lwp',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Depends on LWP',
-		'modified': '2011-02-12 18:24:20',
-		'modified_by': 'Administrator',
-		'name': 'FL04468',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'SS Earning Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/payroll/search_criteria/appraisal_custom/appraisal_custom.txt b/payroll/search_criteria/appraisal_custom/appraisal_custom.txt
deleted file mode 100644
index ece852238f..0000000000
--- a/payroll/search_criteria/appraisal_custom/appraisal_custom.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Appraisal\x01ID,Appraisal\x01Owner,Appraisal\x01Status,Appraisal\x01Employee,Appraisal\x01Employee Name,Appraisal\x01Fiscal Year,Appraisal\x01Company,Appraisal\x01Start Date,Appraisal\x01End Date',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Appraisal custom',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Appraisal',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Appraisal\x01Saved':1,'Appraisal\x01Submitted':1,'Appraisal\x01Status':'','Appraisal\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-10-21 11:35:36',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'appraisal_custom',
-		'owner': 'sneha@webnotestech.com',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
-		'sort_by': '`tabAppraisal`.`name`',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/payroll/search_criteria/datewise_leave_report/datewise_leave_report.txt b/payroll/search_criteria/datewise_leave_report/datewise_leave_report.txt
deleted file mode 100644
index 5c1a9106ee..0000000000
--- a/payroll/search_criteria/datewise_leave_report/datewise_leave_report.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Leave Transaction\x01Employee',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Datewise Leave Report',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': 1,
-		'doc_type': 'Leave Transaction',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Leave Transaction\x01Saved':1,'Leave Transaction\x01Submitted':1,'Leave Transaction\x01Fiscal Year':'','Leave Transaction\x01Leave Type':'','Leave Transaction\x01Leave Transaction Type':'','Leave Transaction\x01Allocation Type':'','Leave Transaction\x01Deduction Type':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': '`tabLeave Transaction`.employee',
-		'idx': None,
-		'modified': '2010-04-01 14:45:55',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'datewise_leave_report',
-		'owner': 'Administrator',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
-		'sort_by': 'ID',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/payroll/search_criteria/datewise_leave_report1/datewise_leave_report1.js b/payroll/search_criteria/datewise_leave_report1/datewise_leave_report1.js
deleted file mode 100644
index e5fc72a556..0000000000
--- a/payroll/search_criteria/datewise_leave_report1/datewise_leave_report1.js
+++ /dev/null
@@ -1,8 +0,0 @@
-report.customize_filters = function() {
-  this.add_filter({fieldname:'from_date', label:'From date', fieldtype:'date', options:'',ignore : 1, parent:'Leave Transaction'});
-  this.add_filter({fieldname:'to_date', label:'To date', fieldtype:'date', options:'',ignore : 1, parent:'Leave Transaction'});
-  this.filter_fields_dict['Leave Transaction'+FILTER_SEP +'From date'].df.in_first_page = 1;
-  this.filter_fields_dict['Leave Transaction'+FILTER_SEP +'To date'].df.in_first_page = 1;
-  this.filter_fields_dict['Leave Transaction'+FILTER_SEP +'From date'].df['report_default'] = sys_defaults.year_start_date;
-  this.filter_fields_dict['Leave Transaction'+FILTER_SEP +'To date'].df['report_default'] = dateutil.obj_to_str(new Date());
-}
\ No newline at end of file
diff --git a/payroll/search_criteria/datewise_leave_report1/datewise_leave_report1.py b/payroll/search_criteria/datewise_leave_report1/datewise_leave_report1.py
deleted file mode 100644
index 4acd1eb65c..0000000000
--- a/payroll/search_criteria/datewise_leave_report1/datewise_leave_report1.py
+++ /dev/null
@@ -1,45 +0,0 @@
-leave_type_lst = sql("select name from `tabLeave Type` where is_active = 'Yes'")
-
-li=['Total Opening']
-if leave_type_lst:
-  for lst in leave_type_lst:
-  
-    li.append(lst[0])
-
-li.append('Total Closing')
-
-
-
-for d in li:
-  colnames.append(d)
-  colwidths.append("100px")
-  coltypes.append("Currency")
-  coloptions.append("")
-  col_idx[d] = len(colnames)-1
-  for r in res:
-    
-    r.append("0")
-
-
-for r in res:
-  for d1 in li:
-    d2 = '%s'%d1
-    if d2 == 'Total Opening':
-      ret_all = sql("select sum(total_leave) from `tabLeave Transaction` where leave_transaction_type = 'Allocation' and employee = '%s' and %s <= to_date and docstatus = 1 and fiscal_year = '2010-2011'" %(r[col_idx['Employee']],filter_values['from_date']))
-      
-      #query = "(SUM(CASE WHEN leave_transaction_type = 'Allocation'  THEN total_leave ELSE 0 END)-SUM(CASE WHEN leave_transaction_type = 'Deduction' AND leave_type != 'Leave Without Pay' THEN total_leave ELSE 0 END))"
-      #query1 = "select " + query + " from `tabLeave Transaction` where employee = '%s' and %s <= to_date and docstatus = 1"
-      #sum_total_leave = sql(query1%(r[col_idx['Employee']],filter_values['from_date']))
-      #r[col_idx[d2]] = flt(sum_total_leave[0][0]) or 0
-      
-    elif d2 == 'Total Closing':
-      query = "(SUM(CASE WHEN leave_transaction_type = 'Allocation' AND leave_type != 'Leave Without Pay' AND leave_type != 'Compensatory Off' THEN total_leave ELSE 0 END)-SUM(CASE WHEN leave_transaction_type = 'Deduction' AND leave_type != 'Leave Without Pay' THEN total_leave ELSE 0 END))"
-      query1 = "select " + query + " from `tabLeave Transaction` where employee = '%s' and %s <= to_date and docstatus = 1"
-      sum_total_leave = sql(query1%(r[col_idx['Employee']],filter_values['to_date']))
-      r[col_idx[d2]] = flt(sum_total_leave[0][0]) or 0
-      
-    elif leave_type_lst:
-      query = "SUM(CASE WHEN leave_transaction_type = 'Deduction' THEN total_leave ELSE 0 END)"
-      query1 = "select " + query + " from `tabLeave Transaction` where leave_type = '%s' and employee = '%s' and (from_date <= %s <= to_date or from_date <= %s <= to_date) and docstatus = 1"
-      sum_total_leave = sql(query1%(d1,r[col_idx['Employee']],filter_values['from_date'],filter_values['to_date']))
-      r[col_idx[d2]] = flt(sum_total_leave[0][0]) or 0
\ No newline at end of file
diff --git a/payroll/search_criteria/datewise_leave_report1/datewise_leave_report1.txt b/payroll/search_criteria/datewise_leave_report1/datewise_leave_report1.txt
deleted file mode 100644
index b58e4b407c..0000000000
--- a/payroll/search_criteria/datewise_leave_report1/datewise_leave_report1.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Leave Transaction\x01Employee',
-		'creation': '2010-12-14 17:56:47',
-		'criteria_name': 'Datewise Leave Report',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': 1,
-		'doc_type': 'Leave Transaction',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Leave Transaction\x01Saved':1,'Leave Transaction\x01Submitted':1,'Leave Transaction\x01Fiscal Year':'','Leave Transaction\x01Leave Type':'','Leave Transaction\x01Leave Transaction Type':'','Leave Transaction\x01Allocation Type':'','Leave Transaction\x01Deduction Type':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': '`tabLeave Transaction`.employee',
-		'idx': None,
-		'modified': '2010-04-01 14:45:55',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'datewise_leave_report1',
-		'owner': 'Administrator',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
-		'sort_by': 'ID',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/payroll/search_criteria/datewise_leave_report2/datewise_leave_report2.js b/payroll/search_criteria/datewise_leave_report2/datewise_leave_report2.js
deleted file mode 100644
index e5fc72a556..0000000000
--- a/payroll/search_criteria/datewise_leave_report2/datewise_leave_report2.js
+++ /dev/null
@@ -1,8 +0,0 @@
-report.customize_filters = function() {
-  this.add_filter({fieldname:'from_date', label:'From date', fieldtype:'date', options:'',ignore : 1, parent:'Leave Transaction'});
-  this.add_filter({fieldname:'to_date', label:'To date', fieldtype:'date', options:'',ignore : 1, parent:'Leave Transaction'});
-  this.filter_fields_dict['Leave Transaction'+FILTER_SEP +'From date'].df.in_first_page = 1;
-  this.filter_fields_dict['Leave Transaction'+FILTER_SEP +'To date'].df.in_first_page = 1;
-  this.filter_fields_dict['Leave Transaction'+FILTER_SEP +'From date'].df['report_default'] = sys_defaults.year_start_date;
-  this.filter_fields_dict['Leave Transaction'+FILTER_SEP +'To date'].df['report_default'] = dateutil.obj_to_str(new Date());
-}
\ No newline at end of file
diff --git a/payroll/search_criteria/datewise_leave_report2/datewise_leave_report2.py b/payroll/search_criteria/datewise_leave_report2/datewise_leave_report2.py
deleted file mode 100644
index 4acd1eb65c..0000000000
--- a/payroll/search_criteria/datewise_leave_report2/datewise_leave_report2.py
+++ /dev/null
@@ -1,45 +0,0 @@
-leave_type_lst = sql("select name from `tabLeave Type` where is_active = 'Yes'")
-
-li=['Total Opening']
-if leave_type_lst:
-  for lst in leave_type_lst:
-  
-    li.append(lst[0])
-
-li.append('Total Closing')
-
-
-
-for d in li:
-  colnames.append(d)
-  colwidths.append("100px")
-  coltypes.append("Currency")
-  coloptions.append("")
-  col_idx[d] = len(colnames)-1
-  for r in res:
-    
-    r.append("0")
-
-
-for r in res:
-  for d1 in li:
-    d2 = '%s'%d1
-    if d2 == 'Total Opening':
-      ret_all = sql("select sum(total_leave) from `tabLeave Transaction` where leave_transaction_type = 'Allocation' and employee = '%s' and %s <= to_date and docstatus = 1 and fiscal_year = '2010-2011'" %(r[col_idx['Employee']],filter_values['from_date']))
-      
-      #query = "(SUM(CASE WHEN leave_transaction_type = 'Allocation'  THEN total_leave ELSE 0 END)-SUM(CASE WHEN leave_transaction_type = 'Deduction' AND leave_type != 'Leave Without Pay' THEN total_leave ELSE 0 END))"
-      #query1 = "select " + query + " from `tabLeave Transaction` where employee = '%s' and %s <= to_date and docstatus = 1"
-      #sum_total_leave = sql(query1%(r[col_idx['Employee']],filter_values['from_date']))
-      #r[col_idx[d2]] = flt(sum_total_leave[0][0]) or 0
-      
-    elif d2 == 'Total Closing':
-      query = "(SUM(CASE WHEN leave_transaction_type = 'Allocation' AND leave_type != 'Leave Without Pay' AND leave_type != 'Compensatory Off' THEN total_leave ELSE 0 END)-SUM(CASE WHEN leave_transaction_type = 'Deduction' AND leave_type != 'Leave Without Pay' THEN total_leave ELSE 0 END))"
-      query1 = "select " + query + " from `tabLeave Transaction` where employee = '%s' and %s <= to_date and docstatus = 1"
-      sum_total_leave = sql(query1%(r[col_idx['Employee']],filter_values['to_date']))
-      r[col_idx[d2]] = flt(sum_total_leave[0][0]) or 0
-      
-    elif leave_type_lst:
-      query = "SUM(CASE WHEN leave_transaction_type = 'Deduction' THEN total_leave ELSE 0 END)"
-      query1 = "select " + query + " from `tabLeave Transaction` where leave_type = '%s' and employee = '%s' and (from_date <= %s <= to_date or from_date <= %s <= to_date) and docstatus = 1"
-      sum_total_leave = sql(query1%(d1,r[col_idx['Employee']],filter_values['from_date'],filter_values['to_date']))
-      r[col_idx[d2]] = flt(sum_total_leave[0][0]) or 0
\ No newline at end of file
diff --git a/payroll/search_criteria/datewise_leave_report2/datewise_leave_report2.txt b/payroll/search_criteria/datewise_leave_report2/datewise_leave_report2.txt
deleted file mode 100644
index e571ce809c..0000000000
--- a/payroll/search_criteria/datewise_leave_report2/datewise_leave_report2.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Leave Transaction\x01Employee',
-		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Datewise Leave Report',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': 1,
-		'doc_type': 'Leave Transaction',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Leave Transaction\x01Saved':1,'Leave Transaction\x01Submitted':1,'Leave Transaction\x01Fiscal Year':'','Leave Transaction\x01Leave Type':'','Leave Transaction\x01Leave Transaction Type':'','Leave Transaction\x01Allocation Type':'','Leave Transaction\x01Deduction Type':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': '`tabLeave Transaction`.employee',
-		'idx': None,
-		'modified': '2010-04-01 14:45:55',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'datewise_leave_report2',
-		'owner': 'Administrator',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
-		'sort_by': 'ID',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/payroll/search_criteria/employee_details1/employee_details1.js b/payroll/search_criteria/employee_details1/employee_details1.js
deleted file mode 100644
index 5e4b42e117..0000000000
--- a/payroll/search_criteria/employee_details1/employee_details1.js
+++ /dev/null
@@ -1,4 +0,0 @@
-report.customize_filters = function() {
-  this.filter_fields_dict['Employee'+FILTER_SEP +'Department'].df.in_first_page = 1;
-  this.filter_fields_dict['Employee'+FILTER_SEP +'ID'].df.in_first_page = 1;
-}
\ No newline at end of file
diff --git a/payroll/search_criteria/employee_details1/employee_details1.py b/payroll/search_criteria/employee_details1/employee_details1.py
deleted file mode 100644
index 084eb914cc..0000000000
--- a/payroll/search_criteria/employee_details1/employee_details1.py
+++ /dev/null
@@ -1,13 +0,0 @@
-colwidths[col_idx['ID']]='120px'
-colwidths[col_idx['Employee Name']]='150px' 
-colwidths[col_idx['Department']] = '150px'
-colwidths[col_idx['Designation']]='120px' 
-colwidths[col_idx['Branch']] ='120px'
-colwidths[col_idx['Company Email']]='170px' 
-colwidths[col_idx['Relieving Date']]='120px' 
-colwidths[col_idx['Employment Type']]='120px' 
-colwidths[col_idx['Date of Joining']]='120px'
-colwidths[col_idx['Scheduled Confirmation Date']]='150px' 
-colwidths[col_idx['Contract End Date']]='120px'
-colwidths[col_idx['Employee Code']]='120px' 
-colwidths[col_idx['Employee Number']]='120px'
diff --git a/payroll/search_criteria/employee_details1/employee_details1.txt b/payroll/search_criteria/employee_details1/employee_details1.txt
deleted file mode 100644
index 20e384ce09..0000000000
--- a/payroll/search_criteria/employee_details1/employee_details1.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Employee\x01ID,Employee\x01Employee Name,Employee\x01Employee Code,Employee\x01Employee Number,Employee\x01Gender,Employee\x01Employment Type,Employee\x01Date of Joining,Employee\x01Scheduled Confirmation Date,Employee\x01Contract End Date,Employee\x01Status,Employee\x01Branch,Employee\x01Department,Employee\x01Designation,Employee\x01Grade,Employee\x01Company Email,Employee\x01Relieving Date',
-		'creation': '2010-12-14 17:56:47',
-		'criteria_name': 'Employee Details',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Employee',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Employee\x01Gender':'','Employee\x01Month of Birth':'','Employee\x01Status':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-04-01 14:27:15',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'employee_details1',
-		'owner': 'Administrator',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
-		'sort_by': 'ID',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/payroll/search_criteria/employee_details2/employee_details2.js b/payroll/search_criteria/employee_details2/employee_details2.js
deleted file mode 100644
index 5e4b42e117..0000000000
--- a/payroll/search_criteria/employee_details2/employee_details2.js
+++ /dev/null
@@ -1,4 +0,0 @@
-report.customize_filters = function() {
-  this.filter_fields_dict['Employee'+FILTER_SEP +'Department'].df.in_first_page = 1;
-  this.filter_fields_dict['Employee'+FILTER_SEP +'ID'].df.in_first_page = 1;
-}
\ No newline at end of file
diff --git a/payroll/search_criteria/employee_details2/employee_details2.py b/payroll/search_criteria/employee_details2/employee_details2.py
deleted file mode 100644
index 084eb914cc..0000000000
--- a/payroll/search_criteria/employee_details2/employee_details2.py
+++ /dev/null
@@ -1,13 +0,0 @@
-colwidths[col_idx['ID']]='120px'
-colwidths[col_idx['Employee Name']]='150px' 
-colwidths[col_idx['Department']] = '150px'
-colwidths[col_idx['Designation']]='120px' 
-colwidths[col_idx['Branch']] ='120px'
-colwidths[col_idx['Company Email']]='170px' 
-colwidths[col_idx['Relieving Date']]='120px' 
-colwidths[col_idx['Employment Type']]='120px' 
-colwidths[col_idx['Date of Joining']]='120px'
-colwidths[col_idx['Scheduled Confirmation Date']]='150px' 
-colwidths[col_idx['Contract End Date']]='120px'
-colwidths[col_idx['Employee Code']]='120px' 
-colwidths[col_idx['Employee Number']]='120px'
diff --git a/payroll/search_criteria/employee_details2/employee_details2.txt b/payroll/search_criteria/employee_details2/employee_details2.txt
deleted file mode 100644
index ec62c917f8..0000000000
--- a/payroll/search_criteria/employee_details2/employee_details2.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Employee\x01ID,Employee\x01Employee Name,Employee\x01Employee Code,Employee\x01Employee Number,Employee\x01Gender,Employee\x01Employment Type,Employee\x01Date of Joining,Employee\x01Scheduled Confirmation Date,Employee\x01Contract End Date,Employee\x01Status,Employee\x01Branch,Employee\x01Department,Employee\x01Designation,Employee\x01Grade,Employee\x01Company Email,Employee\x01Relieving Date',
-		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Employee Details',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Employee',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Employee\x01Gender':'','Employee\x01Month of Birth':'','Employee\x01Status':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-04-01 14:27:15',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'employee_details2',
-		'owner': 'Administrator',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
-		'sort_by': 'ID',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/payroll/search_criteria/employee_in_company_experience1/employee_in_company_experience1.txt b/payroll/search_criteria/employee_in_company_experience1/employee_in_company_experience1.txt
deleted file mode 100644
index 76f6cd61a5..0000000000
--- a/payroll/search_criteria/employee_in_company_experience1/employee_in_company_experience1.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Employee Profile\x01Employee,Experience In Company Detail\x01Branch,Experience In Company Detail\x01Department,Experience In Company Detail\x01Designation,Experience In Company Detail\x01Grade,Experience In Company Detail\x01From Date,Experience In Company Detail\x01To Date',
-		'creation': '2010-12-14 17:56:47',
-		'criteria_name': 'Employee In Company Experience',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': 1,
-		'doc_type': 'Experience In Company Detail',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': '{}',
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-04-01 14:27:15',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'employee_in_company_experience1',
-		'owner': 'Administrator',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': 'Employee Profile',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': '',
-		'sort_by': 'ID',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/payroll/search_criteria/employee_in_company_experience2/employee_in_company_experience2.txt b/payroll/search_criteria/employee_in_company_experience2/employee_in_company_experience2.txt
deleted file mode 100644
index 69ad92d32d..0000000000
--- a/payroll/search_criteria/employee_in_company_experience2/employee_in_company_experience2.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Employee Profile\x01Employee,Experience In Company Detail\x01Branch,Experience In Company Detail\x01Department,Experience In Company Detail\x01Designation,Experience In Company Detail\x01Grade,Experience In Company Detail\x01From Date,Experience In Company Detail\x01To Date',
-		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Employee In Company Experience',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': 1,
-		'doc_type': 'Experience In Company Detail',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': '{}',
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-04-01 14:27:15',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'employee_in_company_experience2',
-		'owner': 'Administrator',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': 'Employee Profile',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
-		'sort_by': 'ID',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/payroll/search_criteria/employees_birthday1/employees_birthday1.js b/payroll/search_criteria/employees_birthday1/employees_birthday1.js
deleted file mode 100644
index 87e77c10e0..0000000000
--- a/payroll/search_criteria/employees_birthday1/employees_birthday1.js
+++ /dev/null
@@ -1,6 +0,0 @@
-report.customize_filters = function() {
-  this.filter_fields_dict['Employee'+FILTER_SEP +'From Date of Birth'].df.in_first_page = 1;
-  this.filter_fields_dict['Employee'+FILTER_SEP +'To Date of Birth'].df.in_first_page = 1;
-  this.filter_fields_dict['Employee'+FILTER_SEP +'Month of Birth'].df.in_first_page = 1;
-  this.filter_fields_dict['Employee'+FILTER_SEP +'Department'].df.in_first_page = 1;
-}
\ No newline at end of file
diff --git a/payroll/search_criteria/employees_birthday1/employees_birthday1.py b/payroll/search_criteria/employees_birthday1/employees_birthday1.py
deleted file mode 100644
index 8886a7e26c..0000000000
--- a/payroll/search_criteria/employees_birthday1/employees_birthday1.py
+++ /dev/null
@@ -1,7 +0,0 @@
-colwidths[col_idx['ID']]='120px'
-colwidths[col_idx['Employee Name']]='150px' 
-colwidths[col_idx['Department']] = '150px'
-#colwidths[col_idx['Employee Code']]='120px' 
-#colwidths[col_idx['Employee Number']] ='120px'
-colwidths[col_idx['Date of Birth']]='110px' 
-colwidths[col_idx['Month of Birth']]='120px' 
\ No newline at end of file
diff --git a/payroll/search_criteria/employees_birthday1/employees_birthday1.txt b/payroll/search_criteria/employees_birthday1/employees_birthday1.txt
deleted file mode 100644
index ded40e2056..0000000000
--- a/payroll/search_criteria/employees_birthday1/employees_birthday1.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Employee\x01ID,Employee\x01Employee Name,Employee\x01Department,Employee\x01Gender,Employee\x01Date of Birth,Employee\x01Month of Birth',
-		'creation': '2010-12-14 17:56:47',
-		'criteria_name': "Employee's Birthday",
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Employee',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Employee\x01Saved':1,'Employee\x01Gender':'','Employee\x01Month of Birth':'May','Employee\x01Status':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-08-04 13:15:28',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'employees_birthday1',
-		'owner': 'Administrator',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
-		'sort_by': '`tabEmployee`.`name`',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/payroll/search_criteria/installed_items/installed_items.js b/payroll/search_criteria/installed_items/installed_items.js
deleted file mode 100644
index b6f838e7a1..0000000000
--- a/payroll/search_criteria/installed_items/installed_items.js
+++ /dev/null
@@ -1,5 +0,0 @@
-report.customize_filters = function() {
-  this.filter_fields_dict['Serial No'+FILTER_SEP +'ID'].df.in_first_page = 1;
-  this.filter_fields_dict['Serial No'+FILTER_SEP +'Status'].df.filter_hide = 1;
-}
-this.mytabs.items['Select Columns'].hide();
\ No newline at end of file
diff --git a/payroll/search_criteria/installed_items/installed_items.txt b/payroll/search_criteria/installed_items/installed_items.txt
deleted file mode 100644
index 1ee04e5b89..0000000000
--- a/payroll/search_criteria/installed_items/installed_items.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': "`tabSerial No`.status = 'Installed'",
-		'add_tab': None,
-		'columns': 'Serial No\x01ID,Serial No\x01Item Code,Serial No\x01Item Group,Serial No\x01Warranty Period (Days),Serial No\x01Warranty Expiry Date,Serial No\x01AMC Expiry Date,Serial No\x01Maintenance Status,Serial No\x01Delivery Note No,Serial No\x01Customer Name',
-		'creation': '2010-09-01 15:47:57',
-		'criteria_name': 'Installed Items',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Serial No',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Serial No\x01Saved':1,'Serial No\x01Submitted':1,'Serial No\x01Status':'','Serial No\x01Maintenance Status':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-09-01 14:19:22',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'installed_items',
-		'owner': 'ashwini@webnotestech.com',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
-		'sort_by': '`tabSerial No`.`name`',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/payroll/search_criteria/monthly_salary_register1/monthly_salary_register1.js b/payroll/search_criteria/monthly_salary_register1/monthly_salary_register1.js
deleted file mode 100644
index 3da56bb477..0000000000
--- a/payroll/search_criteria/monthly_salary_register1/monthly_salary_register1.js
+++ /dev/null
@@ -1,4 +0,0 @@
-report.customize_filters = function() {
-  this.filter_fields_dict['Salary Slip'+FILTER_SEP +'Month'].df.in_first_page = 1;
-  this.filter_fields_dict['Salary Slip'+FILTER_SEP +'Year'].df.in_first_page = 1;
-}
\ No newline at end of file
diff --git a/payroll/search_criteria/monthly_salary_register1/monthly_salary_register1.py b/payroll/search_criteria/monthly_salary_register1/monthly_salary_register1.py
deleted file mode 100644
index bbbe86f86b..0000000000
--- a/payroll/search_criteria/monthly_salary_register1/monthly_salary_register1.py
+++ /dev/null
@@ -1,98 +0,0 @@
-colwidths[col_idx['Employee Name']]="120px" 
-colwidths[col_idx['Leave Without Pay']] = '120px'
-
-sum_net = total_earning = total_deduction = total_lwp = total_arr = 0
-total = ['Total Net Pay','','']
-
-
-earn_type_lst = sql("select name from `tabEarning Type`")
-
-ded_type_lst = sql("select name from `tabDeduction Type`")
-li=[]
-for lst in earn_type_lst:
-  
-  li.append(lst[0])
-  
-  
-
-li.append('Total Earning')
-for lst in ded_type_lst:
-  
-  li.append(lst[0])
-  
-
-li.append('Total Deduction')
-li.append('Net Pay')
-
-
-
-for d in li:
-  colnames.append(d)
-  colwidths.append("150px")
-  coltypes.append("Currency")
-  coloptions.append("")
-  col_idx[d] = len(colnames)-1
-  for r in res:
-    r.append("0")
-
-for r in res:
-  
-  total_lwp += r[col_idx['Leave Without Pay']]
-  total_arr += r[col_idx['Arrear Amount']]
-  
-  for d1 in li:
-    d2 = '%s'%d1
-    
-    earn_ret=convert_to_lists(sql("select e_type,e_amount from `tabSS Earning Detail` where parent = '%s'"%r[col_idx['ID']]))
-    ded_ret=convert_to_lists(sql("select d_type,d_amount from `tabSS Deduction Detail` where parent = '%s'"%r[col_idx['ID']]))
-    
-
-    for e in earn_ret:
-      e0 = '%s'%e[0]
-      r[col_idx[e0]]=flt(e[1]) or 0.00
-     
-    
-    for d in ded_ret:
-      d0 = '%s'%d[0]
-      r[col_idx[d0]]=flt(d[1]) or 0.00
-      
-        
-    tot_earn_ded_net_ret = sql("select gross_pay, total_deduction,net_pay from `tabSalary Slip` where name = '%s'"%r[col_idx['ID']])
-    if d2 == 'Total Earning':
-      r[col_idx[d2]] = flt(tot_earn_ded_net_ret[0][0]) or 0
-      total_earning += flt(tot_earn_ded_net_ret[0][0]) or 0
-    elif d2 == 'Total Deduction':
-      r[col_idx[d2]] = flt(tot_earn_ded_net_ret[0][1]) or 0
-      total_deduction += flt(tot_earn_ded_net_ret[0][1]) or 0
-    elif d2 == 'Net Pay':
-      r[col_idx[d2]] = flt(tot_earn_ded_net_ret[0][2]) or 0
-      sum_net += flt(tot_earn_ded_net_ret[0][2]) or 0
- 
- 
-total.append(total_lwp)
-total.append(total_arr)
-
-for lst in earn_type_lst:
-  
-  total_ear = 0
-  for r in res:
-   
-    lst0 = '%s'%lst[0]
-    total_ear += r[col_idx[lst0]]
-    
-  total.append(total_ear) 
-  
-total.append(total_earning)
-for lst in ded_type_lst:
-  total_ded = 0
-  for r in res:
-    lst0 = '%s'%lst[0]
-    total_ded += r[col_idx[lst0]]
-    
-  total.append(total_ded) 
-
-
-total.append(total_deduction)
-total.append(sum_net)
-
-res.append(total)
\ No newline at end of file
diff --git a/payroll/search_criteria/monthly_salary_register1/monthly_salary_register1.txt b/payroll/search_criteria/monthly_salary_register1/monthly_salary_register1.txt
deleted file mode 100644
index 8453b4e3b0..0000000000
--- a/payroll/search_criteria/monthly_salary_register1/monthly_salary_register1.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Salary Slip\x01ID,Salary Slip\x01Employee,Salary Slip\x01Employee Name,Salary Slip\x01Leave Without Pay,Salary Slip\x01Arrear Amount',
-		'creation': '2010-12-14 17:56:47',
-		'criteria_name': 'Monthly Salary Register',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Salary Slip',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Salary Slip\x01Month':'','Salary Slip\x01Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-04-05 14:43:08',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'monthly_salary_register1',
-		'owner': 'Administrator',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
-		'sort_by': 'ID',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/payroll/search_criteria/monthly_salary_register2/monthly_salary_register2.js b/payroll/search_criteria/monthly_salary_register2/monthly_salary_register2.js
deleted file mode 100644
index 3da56bb477..0000000000
--- a/payroll/search_criteria/monthly_salary_register2/monthly_salary_register2.js
+++ /dev/null
@@ -1,4 +0,0 @@
-report.customize_filters = function() {
-  this.filter_fields_dict['Salary Slip'+FILTER_SEP +'Month'].df.in_first_page = 1;
-  this.filter_fields_dict['Salary Slip'+FILTER_SEP +'Year'].df.in_first_page = 1;
-}
\ No newline at end of file
diff --git a/payroll/search_criteria/monthly_salary_register2/monthly_salary_register2.py b/payroll/search_criteria/monthly_salary_register2/monthly_salary_register2.py
deleted file mode 100644
index bbbe86f86b..0000000000
--- a/payroll/search_criteria/monthly_salary_register2/monthly_salary_register2.py
+++ /dev/null
@@ -1,98 +0,0 @@
-colwidths[col_idx['Employee Name']]="120px" 
-colwidths[col_idx['Leave Without Pay']] = '120px'
-
-sum_net = total_earning = total_deduction = total_lwp = total_arr = 0
-total = ['Total Net Pay','','']
-
-
-earn_type_lst = sql("select name from `tabEarning Type`")
-
-ded_type_lst = sql("select name from `tabDeduction Type`")
-li=[]
-for lst in earn_type_lst:
-  
-  li.append(lst[0])
-  
-  
-
-li.append('Total Earning')
-for lst in ded_type_lst:
-  
-  li.append(lst[0])
-  
-
-li.append('Total Deduction')
-li.append('Net Pay')
-
-
-
-for d in li:
-  colnames.append(d)
-  colwidths.append("150px")
-  coltypes.append("Currency")
-  coloptions.append("")
-  col_idx[d] = len(colnames)-1
-  for r in res:
-    r.append("0")
-
-for r in res:
-  
-  total_lwp += r[col_idx['Leave Without Pay']]
-  total_arr += r[col_idx['Arrear Amount']]
-  
-  for d1 in li:
-    d2 = '%s'%d1
-    
-    earn_ret=convert_to_lists(sql("select e_type,e_amount from `tabSS Earning Detail` where parent = '%s'"%r[col_idx['ID']]))
-    ded_ret=convert_to_lists(sql("select d_type,d_amount from `tabSS Deduction Detail` where parent = '%s'"%r[col_idx['ID']]))
-    
-
-    for e in earn_ret:
-      e0 = '%s'%e[0]
-      r[col_idx[e0]]=flt(e[1]) or 0.00
-     
-    
-    for d in ded_ret:
-      d0 = '%s'%d[0]
-      r[col_idx[d0]]=flt(d[1]) or 0.00
-      
-        
-    tot_earn_ded_net_ret = sql("select gross_pay, total_deduction,net_pay from `tabSalary Slip` where name = '%s'"%r[col_idx['ID']])
-    if d2 == 'Total Earning':
-      r[col_idx[d2]] = flt(tot_earn_ded_net_ret[0][0]) or 0
-      total_earning += flt(tot_earn_ded_net_ret[0][0]) or 0
-    elif d2 == 'Total Deduction':
-      r[col_idx[d2]] = flt(tot_earn_ded_net_ret[0][1]) or 0
-      total_deduction += flt(tot_earn_ded_net_ret[0][1]) or 0
-    elif d2 == 'Net Pay':
-      r[col_idx[d2]] = flt(tot_earn_ded_net_ret[0][2]) or 0
-      sum_net += flt(tot_earn_ded_net_ret[0][2]) or 0
- 
- 
-total.append(total_lwp)
-total.append(total_arr)
-
-for lst in earn_type_lst:
-  
-  total_ear = 0
-  for r in res:
-   
-    lst0 = '%s'%lst[0]
-    total_ear += r[col_idx[lst0]]
-    
-  total.append(total_ear) 
-  
-total.append(total_earning)
-for lst in ded_type_lst:
-  total_ded = 0
-  for r in res:
-    lst0 = '%s'%lst[0]
-    total_ded += r[col_idx[lst0]]
-    
-  total.append(total_ded) 
-
-
-total.append(total_deduction)
-total.append(sum_net)
-
-res.append(total)
\ No newline at end of file
diff --git a/payroll/search_criteria/monthly_salary_register2/monthly_salary_register2.txt b/payroll/search_criteria/monthly_salary_register2/monthly_salary_register2.txt
deleted file mode 100644
index 60fb286b82..0000000000
--- a/payroll/search_criteria/monthly_salary_register2/monthly_salary_register2.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Salary Slip\x01ID,Salary Slip\x01Employee,Salary Slip\x01Employee Name,Salary Slip\x01Leave Without Pay,Salary Slip\x01Arrear Amount',
-		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Monthly Salary Register',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Salary Slip',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Salary Slip\x01Month':'','Salary Slip\x01Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-04-05 14:43:08',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'monthly_salary_register2',
-		'owner': 'Administrator',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
-		'sort_by': 'ID',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/payroll/search_criteria/salary_slips1/salary_slips1.txt b/payroll/search_criteria/salary_slips1/salary_slips1.txt
deleted file mode 100644
index 1e1ba0036a..0000000000
--- a/payroll/search_criteria/salary_slips1/salary_slips1.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Salary Slip\x01ID,Salary Slip\x01Fiscal Year,Salary Slip\x01Month,Salary Slip\x01Employee,Salary Slip\x01Employee Name,Salary Slip\x01Department,Salary Slip\x01Designation,Salary Slip\x01Branch,Salary Slip\x01Grade,Salary Slip\x01PF No.,Salary Slip\x01ESIC No.,Salary Slip\x01Leave Without Pay,Salary Slip\x01Bank Name,Salary Slip\x01Bank Account No.,Salary Slip\x01Payment days,Salary Slip\x01Arrear Amount,Salary Slip\x01Encashment Amount,Salary Slip\x01Gross Pay,Salary Slip\x01Total Deduction,Salary Slip\x01Net Pay',
-		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Salary Slips1',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Salary Slip',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Salary Slip\x01Saved':1,'Salary Slip\x01Submitted':1}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2011-05-09 11:18:14',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'salary_slips1',
-		'owner': 'Administrator',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
-		'sort_by': '`tabSalary Slip`.`name`',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/payroll/search_criteria/salary_structure_details3/salary_structure_details3.txt b/payroll/search_criteria/salary_structure_details3/salary_structure_details3.txt
deleted file mode 100644
index 54b064cdc2..0000000000
--- a/payroll/search_criteria/salary_structure_details3/salary_structure_details3.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Salary Structure\x01ID,Salary Structure\x01Employee,Salary Structure\x01From Date,Salary Structure\x01To Date,Salary Structure\x01Fiscal Year,Salary Structure\x01Branch,Salary Structure\x01Designation,Salary Structure\x01Department,Salary Structure\x01Grade,Salary Structure\x01Is Active,Salary Structure\x01Total Earning,Salary Structure\x01Total Deduction,Salary Structure\x01CTC,Salary Structure\x01Total',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Salary Structure Details3',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Salary Structure',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Salary Structure\x01Branch':'','Salary Structure\x01Designation':'','Salary Structure\x01Department':'','Salary Structure\x01Grade':'','Salary Structure\x01Is Active':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2011-05-09 11:17:56',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'salary_structure_details3',
-		'owner': 'Administrator',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
-		'sort_by': '`tabSalary Structure`.`name`',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/payroll/search_criteria/salary_structure_details4/salary_structure_details4.txt b/payroll/search_criteria/salary_structure_details4/salary_structure_details4.txt
deleted file mode 100644
index 17b3636b4b..0000000000
--- a/payroll/search_criteria/salary_structure_details4/salary_structure_details4.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Salary Structure\x01ID,Salary Structure\x01Employee,Salary Structure\x01Employee Name,Salary Structure\x01Fiscal Year,Salary Structure\x01From Date,Salary Structure\x01To Date,Salary Structure\x01Branch,Salary Structure\x01Designation,Salary Structure\x01Department,Salary Structure\x01Grade,Salary Structure\x01Is Active,Salary Structure\x01CTC,Salary Structure\x01Total Earning,Salary Structure\x01Total Deduction,Salary Structure\x01Total',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Salary Structure Details4',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Salary Structure',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Salary Structure\x01Branch':'','Salary Structure\x01Designation':'','Salary Structure\x01Department':'','Salary Structure\x01Grade':'','Salary Structure\x01Is Active':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2011-05-09 11:17:49',
-		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'salary_structure_details4',
-		'owner': 'Administrator',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
-		'sort_by': '`tabSalary Structure`.`name`',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/mapper/DocType Mapper/Production Forecast-Production Plan/Production Forecast-Production Plan.txt b/production/DocType Mapper/Production Forecast-Production Plan/Production Forecast-Production Plan.txt
similarity index 100%
rename from mapper/DocType Mapper/Production Forecast-Production Plan/Production Forecast-Production Plan.txt
rename to production/DocType Mapper/Production Forecast-Production Plan/Production Forecast-Production Plan.txt
diff --git a/mapper/DocType Mapper/Production Forecast-Production Planning Tool/Production Forecast-Production Planning Tool.txt b/production/DocType Mapper/Production Forecast-Production Planning Tool/Production Forecast-Production Planning Tool.txt
similarity index 100%
rename from mapper/DocType Mapper/Production Forecast-Production Planning Tool/Production Forecast-Production Planning Tool.txt
rename to production/DocType Mapper/Production Forecast-Production Planning Tool/Production Forecast-Production Planning Tool.txt
diff --git a/mapper/DocType Mapper/Sales Order-Production Plan/Sales Order-Production Plan.txt b/production/DocType Mapper/Sales Order-Production Plan/Sales Order-Production Plan.txt
similarity index 100%
rename from mapper/DocType Mapper/Sales Order-Production Plan/Sales Order-Production Plan.txt
rename to production/DocType Mapper/Sales Order-Production Plan/Sales Order-Production Plan.txt
diff --git a/roles/Role/Production Manager/Production Manager.txt b/production/Role/Production Manager/Production Manager.txt
similarity index 100%
rename from roles/Role/Production Manager/Production Manager.txt
rename to production/Role/Production Manager/Production Manager.txt
diff --git a/roles/Role/Production User/Production User.txt b/production/Role/Production User/Production User.txt
similarity index 100%
rename from roles/Role/Production User/Production User.txt
rename to production/Role/Production User/Production User.txt
diff --git a/production/doctype/bill_of_materials/bill_of_materials.txt b/production/doctype/bill_of_materials/bill_of_materials.txt
index dd2c90cf0e..4e788d7cdb 100644
--- a/production/doctype/bill_of_materials/bill_of_materials.txt
+++ b/production/doctype/bill_of_materials/bill_of_materials.txt
@@ -1,1348 +1,532 @@
+# DocType, Bill Of Materials
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:52',
+		'docstatus': 0,
+		'modified': '2010-12-20 17:27:58',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
 	{
-		'_last_update': None,
 		'allow_attach': 0,
 		'allow_copy': 0,
 		'allow_email': 0,
 		'allow_print': 0,
 		'allow_rename': 0,
 		'allow_trash': 1,
-		'autoname': '',
-		'change_log': None,
-		'client_script': '',
-		'client_script_core': None,
-		'client_string': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:52',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocType',
 		'document_type': 'Master',
-		'dt_template': None,
 		'hide_heading': 0,
 		'hide_toolbar': 0,
-		'idx': None,
 		'in_create': 0,
-		'in_dialog': None,
-		'is_transaction_doc': None,
 		'issingle': 0,
 		'istable': 0,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2010-11-23 14:09:29',
-		'modified_by': 'Administrator',
 		'module': 'Production',
-		'name': 'Bill Of Materials',
-		'name_case': '',
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': '',
+		'name': '__common__',
 		'read_only': 0,
-		'read_only_onload': None,
 		'search_fields': 'item',
 		'section_style': 'Tabbed',
-		'server_code': '',
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': '',
 		'subject': '%(item_code)s',
-		'tag_fields': '',
-		'use_template': None,
 		'version': 170
 	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Bill Of Materials',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Bill Of Materials',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Bill Of Materials
+	{
+		'doctype': 'DocType',
+		'name': 'Bill Of Materials'
+	},
+
+	# DocPerm
 	{
-		'amend': None,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2010-08-08 17:08:52',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 1,
-		'match': None,
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'PERM00059',
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'read': 1,
-		'role': 'Administrator',
+		'role': 'System Manager',
 		'submit': 1,
 		'write': 1
 	},
+
+	# DocPerm
 	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:08:52',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 2,
-		'match': None,
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'PERM00060',
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
-		'write': None
+		'role': 'System Manager'
 	},
+
+	# DocPerm
 	{
-		'amend': None,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2010-08-08 17:08:52',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 3,
-		'match': None,
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'PERM00061',
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'read': 1,
 		'role': 'Production Manager',
 		'submit': 1,
 		'write': 1
 	},
+
+	# DocPerm
 	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:08:52',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 4,
-		'match': None,
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'PERM00062',
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'read': 1,
-		'role': 'Production Manager',
-		'submit': None,
-		'write': None
+		'role': 'Production Manager'
 	},
+
+	# DocPerm
 	{
-		'amend': None,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2010-08-08 17:08:52',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 5,
-		'match': None,
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'PERM00063',
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'read': 1,
 		'role': 'Production User',
 		'submit': 1,
 		'write': 1
 	},
+
+	# DocPerm
 	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:08:52',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 6,
-		'match': None,
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'PERM00064',
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'read': 1,
-		'role': 'Production User',
-		'submit': None,
-		'write': None
+		'role': 'Production User'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'trash_reason',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 1,
-		'in_filter': None,
 		'label': 'Trash Reason',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00523',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'trash_reason',
 		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': '',
 		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
-		'in_filter': None,
 		'label': 'TreeView1',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00524',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'HTML',
 		'options': '
Go To BOM Tree View
',
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
-		'in_filter': None,
-		'label': '',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00525',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
 		'options': 'Simple',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
 		'allow_on_submit': 1,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': '',
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': '',
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 4,
-		'in_filter': None,
 		'label': 'Set as Default BOM',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00526',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': '',
 		'oldfieldtype': 'Button',
-		'options': '',
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 5,
-		'in_filter': None,
-		'label': '',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00527',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
 		'allow_on_submit': 1,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
 		'hidden': 1,
-		'icon': None,
 		'idx': 6,
-		'in_filter': None,
 		'label': 'Activate BOM',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00528',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
 		'allow_on_submit': 1,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
 		'hidden': 1,
-		'icon': None,
 		'idx': 7,
-		'in_filter': None,
 		'label': 'Inactivate BOM',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00529',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': '',
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 8,
-		'in_filter': None,
 		'label': 'Details',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00530',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': '',
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
 		'description': 'Select the item code for which Bill of Material is being created',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'item',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 9,
 		'in_filter': 1,
 		'label': 'Item',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00531',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'item',
 		'oldfieldtype': 'Link',
 		'options': 'Item',
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
 		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'description',
 		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 10,
-		'in_filter': None,
 		'label': 'Description',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00532',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'description',
 		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '300px'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
 		'description': 'Total quantity of items for which raw materials required and operations done will be defined',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'quantity',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 11,
-		'in_filter': None,
 		'label': 'Quantity',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00533',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'quantity',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': '',
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'is_active',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 12,
-		'in_filter': None,
 		'label': 'Is Active',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00534',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'is_active',
 		'oldfieldtype': 'Select',
 		'options': '\nYes\nNo',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': '',
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'is_default',
 		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
 		'idx': 13,
-		'in_filter': None,
 		'label': 'Is Default',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00535',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'is_default',
 		'oldfieldtype': 'Check',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': '',
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:47:55',
-		'default': None,
-		'depends_on': None,
 		'description': 'Select name of the project if Bill Of Materials need to be created against any project',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'project_name',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 14,
 		'in_filter': 1,
 		'label': 'Project Name',
-		'modified': '2010-09-01 15:47:55',
-		'modified_by': 'Administrator',
-		'name': 'FL03820',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'project_name',
 		'oldfieldtype': 'Link',
 		'options': 'Project',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': '',
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 15,
-		'in_filter': None,
 		'label': 'Operations',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00536',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': '',
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
 		'description': 'Specify the operations performed and give a unique Operation no to your operations. Select the workstation which is nothing but machinery where this operation would be performed on raw materials. Hour rate will be fetched from the Workstation master. Operation time will be entered manually. Operating cost will be calculated once the Bill of Material is saved.',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'bom_operations',
 		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
 		'idx': 16,
-		'in_filter': None,
 		'label': 'BOM Operations',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00537',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'bom_operations',
 		'oldfieldtype': 'Table',
 		'options': 'BOM Operation',
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': '',
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 17,
-		'in_filter': None,
 		'label': 'Materials',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00538',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
 		'description': 'Enter the raw materials required to manufacture the BOM item. Specify the operation no as entered in the previous tab which will be performed on the raw materials entered.',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'bom_materials',
 		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
 		'idx': 18,
-		'in_filter': None,
 		'label': 'BOM Material',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00539',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'bom_materials',
 		'oldfieldtype': 'Table',
 		'options': 'BOM Material',
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': '',
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 19,
-		'in_filter': None,
 		'label': 'Costing',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00540',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'remarks',
 		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 20,
-		'in_filter': None,
 		'label': 'Remarks',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00541',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'remarks',
 		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': '',
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'cost_as_per_mar',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 21,
-		'in_filter': None,
 		'label': 'Cost As Per Valuation Rate',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00542',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'cost_as_per_mar',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'cost_as_per_lpr',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 22,
-		'in_filter': None,
 		'label': 'Cost As Per LPR',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00543',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'cost_as_per_lpr',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'cost_as_per_sr',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 23,
-		'in_filter': None,
 		'label': 'Cost As Per SR',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00544',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'cost_as_per_sr',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'cost_as_on',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 24,
-		'in_filter': None,
 		'label': 'Cost as on',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00545',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'cost_as_on',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': '',
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'dir_mat_as_per_mar',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 25,
-		'in_filter': None,
 		'label': 'Direct Material As Per Valuation',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00546',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'dir_mat_as_per_mar',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'dir_mat_as_per_lpr',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 26,
-		'in_filter': None,
 		'label': 'Direct Material As Per LPR',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00547',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'dir_mat_as_per_lpr',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'dir_mat_as_per_sr',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 27,
-		'in_filter': None,
 		'label': 'Direct Material As Per SR',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00548',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'dir_mat_as_per_sr',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'operating_cost',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 28,
-		'in_filter': None,
 		'label': 'Operating Cost',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00549',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'operating_cost',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'maintained_by',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 29,
-		'in_filter': None,
 		'label': 'Maintained By',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00550',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'maintained_by',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': '',
 		'fieldtype': 'Section Break',
 		'hidden': 1,
-		'icon': None,
 		'idx': 30,
-		'in_filter': None,
 		'label': 'BOM Report',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00551',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': '',
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
 		'hidden': 0,
-		'icon': None,
 		'idx': 31,
-		'in_filter': None,
 		'label': 'Flat BOM',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00552',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:52',
 		'default': 'No Toolbar',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'flat_bom_details',
 		'fieldtype': 'Table',
 		'hidden': 0,
-		'icon': None,
 		'idx': 32,
-		'in_filter': None,
 		'label': 'Flat BOM Detail',
-		'modified': '2010-08-08 17:08:52',
-		'modified_by': 'Administrator',
-		'name': 'FL00553',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'flat_bom_details',
 		'oldfieldtype': 'Table',
 		'options': 'Flat BOM Detail',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Bill Of Materials',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': '',
-		'width': None
+		'permlevel': 0
 	}
 ]
\ No newline at end of file
diff --git a/production/doctype/bom_control/bom_control.txt b/production/doctype/bom_control/bom_control.txt
index c126874771..6bf618c678 100644
--- a/production/doctype/bom_control/bom_control.txt
+++ b/production/doctype/bom_control/bom_control.txt
@@ -1 +1,31 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-08-31 15:17:30', 'search_fields': None, 'module': 'Production', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 108, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'nabin@webnotestech.com', 'document_type': None, 'name': 'BOM Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
+# DocType, BOM Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:53',
+		'docstatus': 0,
+		'modified': '2010-12-23 11:22:14',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Production',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 107
+	},
+
+	# DocType, BOM Control
+	{
+		'doctype': 'DocType',
+		'name': 'BOM Control'
+	}
+]
\ No newline at end of file
diff --git a/production/doctype/bom_material/bom_material.txt b/production/doctype/bom_material/bom_material.txt
index ea978b377a..1ce35a2f14 100644
--- a/production/doctype/bom_material/bom_material.txt
+++ b/production/doctype/bom_material/bom_material.txt
@@ -1 +1,339 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-08-31 15:17:24', 'search_fields': None, 'module': 'Production', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 23, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': '', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'nabin@webnotestech.com', 'document_type': None, 'name': 'BOM Material', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM00380', 'parent': 'BOM Material', 'read': 1, 'create': None, 'creation': '2009-08-31 15:17:24', 'modified': '2010-09-01 14:31:24', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM00381', 'parent': 'BOM Material', 'read': 1, 'create': None, 'creation': '2009-08-31 15:17:24', 'modified': '2010-09-01 14:31:24', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-08-31 15:17:24', 'doctype': 'DocField', 'oldfieldname': 'operation_no', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Operation No', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Material', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02760', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'operation_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-08-31 15:17:24', 'doctype': 'DocField', 'oldfieldname': 'item_code', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Item Code', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Material', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02761', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'item_code', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-08-31 15:17:24', 'doctype': 'DocField', 'oldfieldname': 'bom_no', 'owner': 'Administrator', 'reqd': 0, 'in_filter': 1, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'BOM No', 'width': '150px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Material', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02762', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'bom_no', 'fieldtype': 'Link', 'options': 'Bill Of Materials', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-08-31 15:17:24', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Description', 'width': '250px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Material', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02763', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-12-03 17:38:07', 'doctype': 'DocField', 'oldfieldname': 'qty', 'owner': 'jai@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Qty', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Material', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03468', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-12-03 17:38:07', 'doctype': 'DocField', 'oldfieldname': 'scrap', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Scrap %', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Material', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03469', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'scrap', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-08-31 15:17:24', 'doctype': 'DocField', 'oldfieldname': 'stock_uom', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Stock UOM', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Material', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02766', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'stock_uom', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-19 10:03:17', 'doctype': 'DocField', 'oldfieldname': 'dir_mat_as_per_mar', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Direct Material As Per Valuation Rate', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Material', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03615', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'dir_mat_as_per_mar', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-19 10:03:17', 'doctype': 'DocField', 'oldfieldname': 'dir_mat_as_per_lpr', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Direct Material As Per LPR', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Material', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03616', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'dir_mat_as_per_lpr', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-19 10:03:17', 'doctype': 'DocField', 'oldfieldname': 'dir_mat_as_per_sr', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Direct Material As Per SR', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Material', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03617', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'dir_mat_as_per_sr', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:17:24', 'doctype': 'DocField', 'oldfieldname': 'operating_cost', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Operating Cost', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Material', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02768', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'operating_cost', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-19 10:03:17', 'doctype': 'DocField', 'oldfieldname': 'value_as_per_mar', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Value As Per Valuation Rate', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Material', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03618', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'value_as_per_mar', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-19 10:03:17', 'doctype': 'DocField', 'oldfieldname': 'value_as_per_lpr', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Value As Per LPR', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Material', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03619', 'idx': 13, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'value_as_per_lpr', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-19 10:03:17', 'doctype': 'DocField', 'oldfieldname': 'value_as_per_sr', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Value As Per SR', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Material', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03620', 'idx': 14, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'value_as_per_sr', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:17:24', 'doctype': 'DocField', 'oldfieldname': 'moving_avg_rate', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Valuation Rate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Material', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02772', 'idx': 15, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'moving_avg_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-19 10:26:04', 'doctype': 'DocField', 'oldfieldname': 'amount_as_per_mar', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Amount As Per Valuation Rate', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Material', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03621', 'idx': 16, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'amount_as_per_mar', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-12-07 12:34:09', 'doctype': 'DocField', 'oldfieldname': 'last_purchase_rate', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Last Purchase Rate', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Material', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03479', 'idx': 17, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'last_purchase_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-19 09:36:59', 'doctype': 'DocField', 'oldfieldname': 'amount_as_per_lpr', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Amount As Per LPR', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Material', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03612', 'idx': 18, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'amount_as_per_lpr', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-19 09:36:59', 'doctype': 'DocField', 'oldfieldname': 'standard_rate', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Standard Rate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Material', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03613', 'idx': 19, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'standard_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-19 09:36:59', 'doctype': 'DocField', 'oldfieldname': 'amount_as_per_sr', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Amount As Per SR', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Material', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03614', 'idx': 20, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'amount_as_per_sr', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-17 16:45:50', 'doctype': 'DocField', 'oldfieldname': 'qty_consumed_per_unit', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Qty Consumed Per Unit', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Material', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03611', 'idx': 21, 'default': None, 'colour': None, 'modified': '2010-09-01 14:31:24', 'parenttype': 'DocType', 'fieldname': 'qty_consumed_per_unit', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, BOM Material
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:53',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Production',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 22
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'BOM Material',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'BOM Material',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'role': 'System Manager'
+	},
+
+	# DocType, BOM Material
+	{
+		'doctype': 'DocType',
+		'name': 'BOM Material'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'operation_no',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Operation No',
+		'oldfieldname': 'operation_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'bom_no',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'BOM No',
+		'oldfieldname': 'bom_no',
+		'oldfieldtype': 'Link',
+		'options': 'Bill Of Materials',
+		'permlevel': 0,
+		'reqd': 0,
+		'search_index': 1,
+		'trigger': 'Client',
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 4,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'permlevel': 1,
+		'reqd': 0,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'scrap',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'label': 'Scrap %',
+		'oldfieldname': 'scrap',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'dir_mat_as_per_mar',
+		'fieldtype': 'Currency',
+		'idx': 8,
+		'label': 'Direct Material As Per Valuation Rate',
+		'oldfieldname': 'dir_mat_as_per_mar',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'qty',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'label': 'Qty',
+		'oldfieldname': 'qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'dir_mat_as_per_lpr',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'label': 'Direct Material As Per LPR',
+		'oldfieldname': 'dir_mat_as_per_lpr',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'dir_mat_as_per_sr',
+		'fieldtype': 'Currency',
+		'idx': 10,
+		'label': 'Direct Material As Per SR',
+		'oldfieldname': 'dir_mat_as_per_sr',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'operating_cost',
+		'fieldtype': 'Currency',
+		'idx': 11,
+		'label': 'Operating Cost',
+		'oldfieldname': 'operating_cost',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_uom',
+		'fieldtype': 'Data',
+		'idx': 12,
+		'label': 'Stock UOM',
+		'oldfieldname': 'stock_uom',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'value_as_per_mar',
+		'fieldtype': 'Currency',
+		'idx': 12,
+		'label': 'Value As Per Valuation Rate',
+		'oldfieldname': 'value_as_per_mar',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'value_as_per_lpr',
+		'fieldtype': 'Currency',
+		'idx': 13,
+		'label': 'Value As Per LPR',
+		'oldfieldname': 'value_as_per_lpr',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'value_as_per_sr',
+		'fieldtype': 'Currency',
+		'idx': 14,
+		'label': 'Value As Per SR',
+		'oldfieldname': 'value_as_per_sr',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'moving_avg_rate',
+		'fieldtype': 'Currency',
+		'idx': 15,
+		'label': 'Valuation Rate',
+		'oldfieldname': 'moving_avg_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amount_as_per_mar',
+		'fieldtype': 'Currency',
+		'idx': 16,
+		'label': 'Amount As Per Valuation Rate',
+		'oldfieldname': 'amount_as_per_mar',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'last_purchase_rate',
+		'fieldtype': 'Currency',
+		'idx': 17,
+		'label': 'Last Purchase Rate',
+		'oldfieldname': 'last_purchase_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amount_as_per_lpr',
+		'fieldtype': 'Currency',
+		'idx': 18,
+		'label': 'Amount As Per LPR',
+		'oldfieldname': 'amount_as_per_lpr',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'standard_rate',
+		'fieldtype': 'Currency',
+		'idx': 19,
+		'label': 'Standard Rate',
+		'oldfieldname': 'standard_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amount_as_per_sr',
+		'fieldtype': 'Currency',
+		'idx': 20,
+		'label': 'Amount As Per SR',
+		'oldfieldname': 'amount_as_per_sr',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'qty_consumed_per_unit',
+		'fieldtype': 'Currency',
+		'idx': 21,
+		'label': 'Qty Consumed Per Unit',
+		'oldfieldname': 'qty_consumed_per_unit',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/production/doctype/bom_operation/bom_operation.txt b/production/doctype/bom_operation/bom_operation.txt
index 3281811493..873faec352 100644
--- a/production/doctype/bom_operation/bom_operation.txt
+++ b/production/doctype/bom_operation/bom_operation.txt
@@ -1 +1,172 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-08-31 15:17:21', 'search_fields': None, 'module': 'Production', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 6, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'jai@webnotestech.com', 'document_type': None, 'name': 'BOM Operation', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'jai@webnotestech.com', 'name': 'PERM00378', 'parent': 'BOM Operation', 'read': 1, 'create': None, 'creation': '2009-08-31 15:17:21', 'modified': '2010-07-13 12:46:20', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'jai@webnotestech.com', 'name': 'PERM00379', 'parent': 'BOM Operation', 'read': 1, 'create': None, 'creation': '2009-08-31 15:17:21', 'modified': '2010-07-13 12:46:20', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-08-31 15:17:21', 'doctype': 'DocField', 'oldfieldname': 'operation_no', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Operation No', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Operation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02750', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-07-13 12:46:20', 'parenttype': 'DocType', 'fieldname': 'operation_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-08-31 15:17:21', 'doctype': 'DocField', 'oldfieldname': 'opn_description', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Opn Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Operation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02752', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-07-13 12:46:20', 'parenttype': 'DocType', 'fieldname': 'opn_description', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-08-31 15:17:21', 'doctype': 'DocField', 'oldfieldname': 'details', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Operation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02753', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-07-13 12:46:20', 'parenttype': 'DocType', 'fieldname': 'details', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-08-31 15:17:21', 'doctype': 'DocField', 'oldfieldname': 'workstation', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Workstation', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Operation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02754', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-07-13 12:46:20', 'parenttype': 'DocType', 'fieldname': 'workstation', 'fieldtype': 'Link', 'options': 'Workstation', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:17:21', 'doctype': 'DocField', 'oldfieldname': 'hour_rate', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Hour Rate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Operation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02755', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-07-13 12:46:20', 'parenttype': 'DocType', 'fieldname': 'hour_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:17:21', 'doctype': 'DocField', 'oldfieldname': 'workstation_capacity', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Workstation Capacity', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'BOM Operation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02756', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-07-13 12:46:20', 'parenttype': 'DocType', 'fieldname': 'workstation_capacity', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:17:21', 'doctype': 'DocField', 'oldfieldname': 'time_in_mins', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Operation Time (mins)', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Operation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02758', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-07-13 12:46:20', 'parenttype': 'DocType', 'fieldname': 'time_in_mins', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:17:21', 'doctype': 'DocField', 'oldfieldname': 'operating_cost', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Operating Cost', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Operation', 'search_index': None, 'allow_on_submit': 0, 'icon': None, 'name': 'FL02759', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-07-13 12:46:20', 'parenttype': 'DocType', 'fieldname': 'operating_cost', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, BOM Operation
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:53',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Production',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 6
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'BOM Operation',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'BOM Operation',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'role': 'System Manager'
+	},
+
+	# DocType, BOM Operation
+	{
+		'doctype': 'DocType',
+		'name': 'BOM Operation'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'operation_no',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Operation No',
+		'oldfieldname': 'operation_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'opn_description',
+		'fieldtype': 'Text',
+		'idx': 2,
+		'label': 'Opn Description',
+		'oldfieldname': 'opn_description',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'details',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Details',
+		'oldfieldname': 'details',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'workstation',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'label': 'Workstation',
+		'oldfieldname': 'workstation',
+		'oldfieldtype': 'Link',
+		'options': 'Workstation',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'hour_rate',
+		'fieldtype': 'Currency',
+		'idx': 5,
+		'label': 'Hour Rate',
+		'oldfieldname': 'hour_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'workstation_capacity',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 6,
+		'label': 'Workstation Capacity',
+		'oldfieldname': 'workstation_capacity',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'time_in_mins',
+		'fieldtype': 'Currency',
+		'idx': 7,
+		'label': 'Operation Time (mins)',
+		'oldfieldname': 'time_in_mins',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 0,
+		'doctype': 'DocField',
+		'fieldname': 'operating_cost',
+		'fieldtype': 'Currency',
+		'idx': 8,
+		'label': 'Operating Cost',
+		'oldfieldname': 'operating_cost',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'reqd': 0
+	}
+]
\ No newline at end of file
diff --git a/production/doctype/bom_replace_utility/bom_replace_utility.txt b/production/doctype/bom_replace_utility/bom_replace_utility.txt
index 5d466b76bd..f3e1412095 100644
--- a/production/doctype/bom_replace_utility/bom_replace_utility.txt
+++ b/production/doctype/bom_replace_utility/bom_replace_utility.txt
@@ -1 +1,398 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2010-01-14 12:07:32', 'search_fields': None, 'module': 'Production', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'jai@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 1, 'max_attachments': None, 'version': 57, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': None, 'name': 'BOM Replace Utility', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00591', 'parent': 'BOM Replace Utility', 'read': 1, 'create': 1, 'creation': '2010-01-14 12:11:48', 'modified': '2010-09-08 14:37:04', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00702', 'parent': 'BOM Replace Utility', 'read': 1, 'create': None, 'creation': '2010-03-15 13:27:30', 'modified': '2010-09-08 14:37:04', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00700', 'parent': 'BOM Replace Utility', 'read': 1, 'create': 1, 'creation': '2010-03-15 13:26:46', 'modified': '2010-09-08 14:37:04', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'Production User', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00703', 'parent': 'BOM Replace Utility', 'read': 1, 'create': None, 'creation': '2010-03-15 13:27:30', 'modified': '2010-09-08 14:37:04', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 4, 'parenttype': 'DocType', 'role': 'Production User', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00701', 'parent': 'BOM Replace Utility', 'read': 1, 'create': 1, 'creation': '2010-03-15 13:26:46', 'modified': '2010-09-08 14:37:04', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 5, 'parenttype': 'DocType', 'role': 'Production Manager', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00704', 'parent': 'BOM Replace Utility', 'read': 1, 'create': None, 'creation': '2010-03-15 13:27:30', 'modified': '2010-09-08 14:37:04', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 6, 'parenttype': 'DocType', 'role': 'Production Manager', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-07-09 09:11:43', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Create New BOM', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05553', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': 'create_new_bom', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-14 12:11:19', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'BOM Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03585', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-14 12:11:19', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Select BOM', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Select the relevant BOM to be replaced which is actually a raw material used for a parent BOM.', 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03586', 'idx': 3, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': 's_bom', 'fieldtype': 'Link', 'options': 'Bill Of Materials', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-03 14:39:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Note 1', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05800', 'idx': 4, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': 'Click on the button "Search BOM" to fetch in the table below all the parent BOMs in which the above selected BOM is used as a raw material.', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-14 16:57:21', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03601', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-14 12:11:19', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Search BOM', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03588', 'idx': 6, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Button', 'options': 'search_parent_bom_of_bom', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-03 14:27:23', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05799', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': 'Simple', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-14 12:11:19', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Replace Bom with', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Select the BOM by which you want the above sected BOM to be replaced.', 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03587', 'idx': 8, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': 'r_bom', 'fieldtype': 'Link', 'options': 'Bill Of Materials', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-03 14:58:29', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Note 2', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05801', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': 'Click on the button "Replace BOM" after checking under the column Replace against relevant Parent BOMs', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-03 14:27:23', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05798', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-14 12:11:19', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Replace BOM', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03589', 'idx': 11, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Button', 'options': 'replace_bom', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-14 16:57:21', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03602', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': 'Simple', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-14 12:26:51', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Replace BOM Detail', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03598', 'idx': 13, 'default': None, 'colour': None, 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': 'replace_bom_details', 'fieldtype': 'Table', 'options': 'BOM Replace Utility Detail', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-14 12:13:54', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Item Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03590', 'idx': 14, 'default': None, 'colour': None, 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-14 12:13:54', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Select Item', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Select the relevant item to be replaced which is actually a raw material used for a parent BOM.', 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03591', 'idx': 15, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': 's_item', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-03 15:26:44', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Note 3', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05804', 'idx': 16, 'default': None, 'colour': None, 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'HTML', 'options': 'Click on the button "Search Item" to fetch in the table below all the parent BOMs in which the above selected item is used as a raw material.', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-14 16:57:21', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03600', 'idx': 17, 'default': None, 'colour': None, 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-14 12:21:03', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Search Item', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03596', 'idx': 18, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'search_parent_bom_of_item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-03 15:01:51', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05802', 'idx': 19, 'default': None, 'colour': None, 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': 'Simple', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-14 12:13:54', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Replace Item with', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Select the item by which you want the above sected item to be replaced.', 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03592', 'idx': 20, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': 'r_item', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-03 15:26:45', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Note 4', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05805', 'idx': 21, 'default': None, 'colour': None, 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': 'Click on the button "Replace Item" after checking under the column Replace against relevant Parent BOMs', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-03 15:01:51', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05803', 'idx': 22, 'default': None, 'colour': None, 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-14 12:21:03', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Replace Item', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03597', 'idx': 23, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'replace_item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-14 16:57:21', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03603', 'idx': 24, 'default': None, 'colour': None, 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': 'Simple', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-14 12:26:51', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Replace Item Detail', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03599', 'idx': 25, 'default': None, 'colour': None, 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': 'replace_item_details', 'fieldtype': 'Table', 'options': 'BOM Replace Utility Detail', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-07-13 15:09:10', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Update BOM Tree', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05607', 'idx': 26, 'default': None, 'colour': None, 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-07-13 15:09:10', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'FG BOM No', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Select the root Bill of Materials in which raw materials are replaced and click on the button below to update costs.', 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05608', 'idx': 27, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': 'fg_bom_no', 'fieldtype': 'Link', 'options': 'Bill Of Materials', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-07-13 15:09:10', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Update', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05609', 'idx': 28, 'default': None, 'colour': None, 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'update_bom', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-07-13 15:09:10', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Update BOM', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05610', 'idx': 29, 'default': None, 'colour': None, 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-07-13 15:09:10', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'BOM', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': '', 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05611', 'idx': 30, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': 'bom', 'fieldtype': 'Link', 'options': 'Bill Of Materials', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-07-13 15:09:10', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Update Docstatus', 'width': '', 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05612', 'idx': 31, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-08 14:37:04', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'update_docstatus', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, BOM Replace Utility
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:53',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'jai@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Production',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 1,
+		'version': 56
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'BOM Replace Utility',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'BOM Replace Utility',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, BOM Replace Utility
+	{
+		'doctype': 'DocType',
+		'name': 'BOM Replace Utility'
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'Production User',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'Production User'
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Production Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'Production Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'create_new_bom',
+		'fieldtype': 'Check',
+		'idx': 1,
+		'label': 'Create New BOM'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 2,
+		'label': 'BOM Details'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Select the relevant BOM to be replaced which is actually a raw material used for a parent BOM.',
+		'doctype': 'DocField',
+		'fieldname': 's_bom',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'label': 'Select BOM',
+		'options': 'Bill Of Materials',
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 4,
+		'label': 'Note 1',
+		'options': 'Click on the button "Search BOM" to fetch in the table below all the parent BOMs in which the above selected BOM is used as a raw material.'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 5
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 6,
+		'label': 'Search BOM',
+		'options': 'search_parent_bom_of_bom'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 7,
+		'options': 'Simple'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Select the BOM by which you want the above sected BOM to be replaced.',
+		'doctype': 'DocField',
+		'fieldname': 'r_bom',
+		'fieldtype': 'Link',
+		'idx': 8,
+		'label': 'Replace Bom with',
+		'options': 'Bill Of Materials',
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 9,
+		'label': 'Note 2',
+		'options': 'Click on the button "Replace BOM" after checking under the column Replace against relevant Parent BOMs'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 10
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 11,
+		'label': 'Replace BOM',
+		'options': 'replace_bom'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 12,
+		'options': 'Simple'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'replace_bom_details',
+		'fieldtype': 'Table',
+		'idx': 13,
+		'label': 'Replace BOM Detail',
+		'options': 'BOM Replace Utility Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 14,
+		'label': 'Item Details'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Select the relevant item to be replaced which is actually a raw material used for a parent BOM.',
+		'doctype': 'DocField',
+		'fieldname': 's_item',
+		'fieldtype': 'Link',
+		'idx': 15,
+		'label': 'Select Item',
+		'options': 'Item',
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 16,
+		'label': 'Note 3',
+		'options': 'Click on the button "Search Item" to fetch in the table below all the parent BOMs in which the above selected item is used as a raw material.'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 17
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 18,
+		'label': 'Search Item',
+		'options': 'search_parent_bom_of_item'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 19,
+		'options': 'Simple'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Select the item by which you want the above sected item to be replaced.',
+		'doctype': 'DocField',
+		'fieldname': 'r_item',
+		'fieldtype': 'Link',
+		'idx': 20,
+		'label': 'Replace Item with',
+		'options': 'Item',
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 21,
+		'label': 'Note 4',
+		'options': 'Click on the button "Replace Item" after checking under the column Replace against relevant Parent BOMs'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 22
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 23,
+		'label': 'Replace Item',
+		'options': 'replace_item'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 24,
+		'options': 'Simple'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'replace_item_details',
+		'fieldtype': 'Table',
+		'idx': 25,
+		'label': 'Replace Item Detail',
+		'options': 'BOM Replace Utility Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 26,
+		'label': 'Update BOM Tree'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Select the root Bill of Materials in which raw materials are replaced and click on the button below to update costs.',
+		'doctype': 'DocField',
+		'fieldname': 'fg_bom_no',
+		'fieldtype': 'Link',
+		'idx': 27,
+		'label': 'FG BOM No',
+		'options': 'Bill Of Materials'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 28,
+		'label': 'Update',
+		'options': 'update_bom'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 29,
+		'label': 'Update BOM'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'bom',
+		'fieldtype': 'Link',
+		'idx': 30,
+		'label': 'BOM',
+		'options': 'Bill Of Materials'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 31,
+		'label': 'Update Docstatus',
+		'options': 'update_docstatus'
+	}
+]
\ No newline at end of file
diff --git a/production/doctype/bom_replace_utility_detail/bom_replace_utility_detail.txt b/production/doctype/bom_replace_utility_detail/bom_replace_utility_detail.txt
index 1bc8650d4f..ab18e44acc 100644
--- a/production/doctype/bom_replace_utility_detail/bom_replace_utility_detail.txt
+++ b/production/doctype/bom_replace_utility_detail/bom_replace_utility_detail.txt
@@ -1 +1,104 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-01-14 12:17:12', 'search_fields': None, 'module': 'Production', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'jai@webnotestech.com', 'in_dialog': None, 'in_create': 1, 'read_only': 1, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 8, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'BRUD/.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'jai@webnotestech.com', 'document_type': None, 'name': 'BOM Replace Utility Detail', 'idx': None, 'hide_toolbar': 1, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'jai@webnotestech.com', 'name': 'PERM00985', 'parent': 'BOM Replace Utility Detail', 'read': 1, 'create': 0, 'creation': '2010-04-29 10:17:25', 'modified': '2010-04-29 10:17:25', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-01-14 12:19:28', 'doctype': 'DocField', 'oldfieldname': 'parent_bom', 'owner': 'jai@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Parent BOM', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Replace Utility Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03593', 'idx': 1, 'default': None, 'colour': 'White:FFF', 'modified': '2010-04-29 10:17:25', 'parenttype': 'DocType', 'fieldname': 'parent_bom', 'fieldtype': 'Link', 'options': 'Bill Of Materials', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Check', 'creation': '2010-01-14 12:19:28', 'doctype': 'DocField', 'oldfieldname': 'replace', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Replace', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Replace Utility Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03594', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-04-29 10:17:25', 'parenttype': 'DocType', 'fieldname': 'replace', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-01-14 12:19:28', 'doctype': 'DocField', 'oldfieldname': 'bom_created', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'BOM Created', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Replace Utility Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03595', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-04-29 10:17:25', 'parenttype': 'DocType', 'fieldname': 'bom_created', 'fieldtype': 'Link', 'options': 'Bill Of Materials', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, BOM Replace Utility Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:53',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'jai@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'BRUD/.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'hide_toolbar': 1,
+		'in_create': 1,
+		'istable': 1,
+		'module': 'Production',
+		'name': '__common__',
+		'read_only': 1,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 8
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'BOM Replace Utility Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'BOM Replace Utility Detail',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocType, BOM Replace Utility Detail
+	{
+		'doctype': 'DocType',
+		'name': 'BOM Replace Utility Detail'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'parent_bom',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Parent BOM',
+		'oldfieldname': 'parent_bom',
+		'oldfieldtype': 'Link',
+		'options': 'Bill Of Materials',
+		'permlevel': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'replace',
+		'fieldtype': 'Check',
+		'idx': 2,
+		'label': 'Replace',
+		'oldfieldname': 'replace',
+		'oldfieldtype': 'Check',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'bom_created',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'label': 'BOM Created',
+		'oldfieldname': 'bom_created',
+		'oldfieldtype': 'Link',
+		'options': 'Bill Of Materials',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/production/doctype/bom_report_detail/bom_report_detail.txt b/production/doctype/bom_report_detail/bom_report_detail.txt
index f0304908e2..307fe7d07e 100644
--- a/production/doctype/bom_report_detail/bom_report_detail.txt
+++ b/production/doctype/bom_report_detail/bom_report_detail.txt
@@ -1 +1,161 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-08-31 15:17:33', 'search_fields': None, 'module': 'Production', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 8, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': '', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'wasim@webnotestech.com', 'document_type': None, 'name': 'BOM Report Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'wasim@webnotestech.com', 'name': 'PERM00382', 'parent': 'BOM Report Detail', 'read': 1, 'create': None, 'creation': '2009-08-31 15:17:33', 'modified': '2009-12-04 12:04:07', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'wasim@webnotestech.com', 'name': 'PERM00383', 'parent': 'BOM Report Detail', 'read': 1, 'create': None, 'creation': '2009-08-31 15:17:33', 'modified': '2009-12-04 12:04:07', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-08-31 15:17:33', 'doctype': 'DocField', 'oldfieldname': 'item_code', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'wasim@webnotestech.com', 'label': 'Item Code', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'BOM Report Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02776', 'idx': 1, 'default': None, 'colour': None, 'modified': '2009-12-04 12:04:07', 'parenttype': 'DocType', 'fieldname': 'item_code', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-08-31 15:17:33', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'wasim@webnotestech.com', 'label': 'Description', 'width': '250px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Report Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02777', 'idx': 2, 'default': None, 'colour': None, 'modified': '2009-12-04 12:04:07', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-08-31 15:17:33', 'doctype': 'DocField', 'oldfieldname': 'qty', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'wasim@webnotestech.com', 'label': 'Qty', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Report Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02778', 'idx': 3, 'default': None, 'colour': None, 'modified': '2009-12-04 12:04:07', 'parenttype': 'DocType', 'fieldname': 'qty', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-08-31 15:17:33', 'doctype': 'DocField', 'oldfieldname': 'stock_uom', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'wasim@webnotestech.com', 'label': 'Stock UOM', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Report Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02779', 'idx': 4, 'default': None, 'colour': None, 'modified': '2009-12-04 12:04:07', 'parenttype': 'DocType', 'fieldname': 'stock_uom', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:17:33', 'doctype': 'DocField', 'oldfieldname': 'moving_avg_rate', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'wasim@webnotestech.com', 'label': 'Moving Avg Rate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Report Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02780', 'idx': 5, 'default': None, 'colour': None, 'modified': '2009-12-04 12:04:07', 'parenttype': 'DocType', 'fieldname': 'moving_avg_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:17:33', 'doctype': 'DocField', 'oldfieldname': 'amount', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'wasim@webnotestech.com', 'label': 'Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Report Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02781', 'idx': 6, 'default': None, 'colour': None, 'modified': '2009-12-04 12:04:07', 'parenttype': 'DocType', 'fieldname': 'amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-12-03 18:06:08', 'doctype': 'DocField', 'oldfieldname': 'last_purchase_rate', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'wasim@webnotestech.com', 'label': 'Last Purchase Rate', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'BOM Report Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03471', 'idx': 7, 'default': None, 'colour': None, 'modified': '2009-12-04 12:04:07', 'parenttype': 'DocType', 'fieldname': 'last_purchase_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, BOM Report Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:53',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Production',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'version': 8
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'BOM Report Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'BOM Report Detail',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'role': 'System Manager'
+	},
+
+	# DocType, BOM Report Detail
+	{
+		'doctype': 'DocType',
+		'name': 'BOM Report Detail'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'in_filter': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 2,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'permlevel': 1,
+		'reqd': 0,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'moving_avg_rate',
+		'fieldtype': 'Currency',
+		'idx': 5,
+		'label': 'Moving Avg Rate',
+		'oldfieldname': 'moving_avg_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amount',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'label': 'Amount',
+		'oldfieldname': 'amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'last_purchase_rate',
+		'fieldtype': 'Currency',
+		'idx': 7,
+		'label': 'Last Purchase Rate',
+		'oldfieldname': 'last_purchase_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'qty',
+		'fieldtype': 'Data',
+		'idx': 9,
+		'label': 'Qty',
+		'oldfieldname': 'qty',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_uom',
+		'fieldtype': 'Data',
+		'idx': 12,
+		'label': 'Stock UOM',
+		'oldfieldname': 'stock_uom',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'reqd': 0
+	}
+]
\ No newline at end of file
diff --git a/production/doctype/flat_bom_detail/flat_bom_detail.txt b/production/doctype/flat_bom_detail/flat_bom_detail.txt
index 3fc184eb9f..4b8812b44e 100644
--- a/production/doctype/flat_bom_detail/flat_bom_detail.txt
+++ b/production/doctype/flat_bom_detail/flat_bom_detail.txt
@@ -1 +1,216 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-01-11 17:57:57', 'search_fields': None, 'module': 'Production', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'jai@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': 0, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 15, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'FBD/.######', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': None, 'name': 'Flat BOM Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-01-11 17:57:57', 'doctype': 'DocField', 'oldfieldname': 'item_code', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Item Code', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Flat BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03556', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-07-15 10:50:52', 'parenttype': 'DocType', 'fieldname': 'item_code', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2010-01-11 17:57:57', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Flat BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03557', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-07-15 10:50:52', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-11 17:57:57', 'doctype': 'DocField', 'oldfieldname': 'qty', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Qty', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Flat BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03558', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-07-15 10:50:52', 'parenttype': 'DocType', 'fieldname': 'qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-01-11 17:57:57', 'doctype': 'DocField', 'oldfieldname': 'stock_uom', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Stock UOM', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Flat BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03559', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-07-15 10:50:52', 'parenttype': 'DocType', 'fieldname': 'stock_uom', 'fieldtype': 'Link', 'options': 'UOM', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-11 17:57:57', 'doctype': 'DocField', 'oldfieldname': 'moving_avg_rate', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Valuation Rate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Flat BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03560', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-07-15 10:50:52', 'parenttype': 'DocType', 'fieldname': 'moving_avg_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-11 17:57:57', 'doctype': 'DocField', 'oldfieldname': 'amount_as_per_mar', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Amount As Per Valuation Rate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Flat BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03561', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-07-15 10:50:52', 'parenttype': 'DocType', 'fieldname': 'amount_as_per_mar', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-11 17:57:57', 'doctype': 'DocField', 'oldfieldname': 'last_purchase_rate', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Last Purchase Rate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Flat BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03562', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-07-15 10:50:52', 'parenttype': 'DocType', 'fieldname': 'last_purchase_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-19 15:23:27', 'doctype': 'DocField', 'oldfieldname': 'amount_as_per_lpr', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Amount As Per LPR', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Flat BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03636', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-07-15 10:50:52', 'parenttype': 'DocType', 'fieldname': 'amount_as_per_lpr', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-19 15:21:42', 'doctype': 'DocField', 'oldfieldname': 'standard_rate', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Standard Rate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Flat BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03635', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-07-15 10:50:52', 'parenttype': 'DocType', 'fieldname': 'standard_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-19 15:23:27', 'doctype': 'DocField', 'oldfieldname': 'amount_as_per_sr', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Amount As Per SR', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Flat BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03637', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-07-15 10:50:52', 'parenttype': 'DocType', 'fieldname': 'amount_as_per_sr', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-13 16:18:34', 'doctype': 'DocField', 'oldfieldname': 'qty_consumed_per_unit', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Qty Consumed Per Unit', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Flat BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03572', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-07-15 10:50:52', 'parenttype': 'DocType', 'fieldname': 'qty_consumed_per_unit', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-01-12 10:58:43', 'doctype': 'DocField', 'oldfieldname': 'flat_bom_no', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Flat BOM No', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Flat BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03566', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-07-15 10:50:52', 'parenttype': 'DocType', 'fieldname': 'flat_bom_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-01-11 17:57:57', 'doctype': 'DocField', 'oldfieldname': 'bom_mat_no', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'BOM Mat No', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 0, 'description': None, 'parent': 'Flat BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03563', 'idx': 13, 'default': None, 'colour': None, 'modified': '2010-07-15 10:50:52', 'parenttype': 'DocType', 'fieldname': 'bom_mat_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-01-11 17:57:57', 'doctype': 'DocField', 'oldfieldname': 'parent_bom', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Parent BOM', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 0, 'description': None, 'parent': 'Flat BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03564', 'idx': 14, 'default': None, 'colour': None, 'modified': '2010-07-15 10:50:52', 'parenttype': 'DocType', 'fieldname': 'parent_bom', 'fieldtype': 'Link', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-02-08 12:37:51', 'doctype': 'DocField', 'oldfieldname': 'is_pro_applicable', 'owner': 'jai@webnotestech.com', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Is PRO Applicable', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Flat BOM Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03956', 'idx': 15, 'default': None, 'colour': None, 'modified': '2010-07-15 10:50:52', 'parenttype': 'DocType', 'fieldname': 'is_pro_applicable', 'fieldtype': 'Select', 'options': '\nYes\nNo', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Flat BOM Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:02',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'jai@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'FBD/.######',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Production',
+		'name': '__common__',
+		'read_only': 0,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 15
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Flat BOM Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Flat BOM Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Flat BOM Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 2,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'moving_avg_rate',
+		'fieldtype': 'Currency',
+		'idx': 5,
+		'label': 'Valuation Rate',
+		'oldfieldname': 'moving_avg_rate',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amount_as_per_mar',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'label': 'Amount As Per Valuation Rate',
+		'oldfieldname': 'amount_as_per_mar',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'last_purchase_rate',
+		'fieldtype': 'Currency',
+		'idx': 7,
+		'label': 'Last Purchase Rate',
+		'oldfieldname': 'last_purchase_rate',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amount_as_per_lpr',
+		'fieldtype': 'Currency',
+		'idx': 8,
+		'label': 'Amount As Per LPR',
+		'oldfieldname': 'amount_as_per_lpr',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'qty',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'label': 'Qty',
+		'oldfieldname': 'qty',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'standard_rate',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'label': 'Standard Rate',
+		'oldfieldname': 'standard_rate',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amount_as_per_sr',
+		'fieldtype': 'Currency',
+		'idx': 10,
+		'label': 'Amount As Per SR',
+		'oldfieldname': 'amount_as_per_sr',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'qty_consumed_per_unit',
+		'fieldtype': 'Currency',
+		'idx': 11,
+		'label': 'Qty Consumed Per Unit',
+		'oldfieldname': 'qty_consumed_per_unit',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_uom',
+		'fieldtype': 'Link',
+		'idx': 12,
+		'label': 'Stock UOM',
+		'oldfieldname': 'stock_uom',
+		'oldfieldtype': 'Link',
+		'options': 'UOM'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'flat_bom_no',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 12,
+		'label': 'Flat BOM No',
+		'oldfieldname': 'flat_bom_no',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'bom_mat_no',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 13,
+		'label': 'BOM Mat No',
+		'oldfieldname': 'bom_mat_no',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'parent_bom',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 14,
+		'label': 'Parent BOM',
+		'oldfieldname': 'parent_bom',
+		'oldfieldtype': 'Link'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_pro_applicable',
+		'fieldtype': 'Select',
+		'idx': 15,
+		'label': 'Is PRO Applicable',
+		'oldfieldname': 'is_pro_applicable',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'reqd': 0
+	}
+]
\ No newline at end of file
diff --git a/production/doctype/pf_detail/pf_detail.txt b/production/doctype/pf_detail/pf_detail.txt
index a835dae83b..5c29c84f76 100644
--- a/production/doctype/pf_detail/pf_detail.txt
+++ b/production/doctype/pf_detail/pf_detail.txt
@@ -1 +1,216 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-08-31 15:17:39', 'search_fields': None, 'module': 'Production', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 1, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': 'PFD/.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'PF Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00386', 'parent': 'PF Detail', 'read': 1, 'create': 1, 'creation': '2009-08-31 15:17:39', 'modified': '2010-03-31 10:48:34', 'submit': 1, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00387', 'parent': 'PF Detail', 'read': 1, 'create': None, 'creation': '2009-08-31 15:17:39', 'modified': '2010-03-31 10:48:34', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-08-31 15:17:39', 'doctype': 'DocField', 'oldfieldname': 'item_code', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Item Code', 'width': '150px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PF Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02804', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-03-31 10:48:34', 'parenttype': 'DocType', 'fieldname': 'item_code', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-08-31 15:17:39', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Description', 'width': '200px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PF Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02805', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-03-31 10:48:34', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-08-31 15:17:39', 'doctype': 'DocField', 'oldfieldname': 'stock_uom', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Stock UOM', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PF Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02806', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-03-31 10:48:34', 'parenttype': 'DocType', 'fieldname': 'stock_uom', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:17:39', 'doctype': 'DocField', 'oldfieldname': 'qty', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Quantity', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PF Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02807', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-03-31 10:48:34', 'parenttype': 'DocType', 'fieldname': 'qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:17:39', 'doctype': 'DocField', 'oldfieldname': 'planned_qty', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Planned Quantity', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PF Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02808', 'idx': 5, 'default': '0.00', 'colour': None, 'modified': '2010-03-31 10:48:34', 'parenttype': 'DocType', 'fieldname': 'planned_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:17:39', 'doctype': 'DocField', 'oldfieldname': 'produced_qty', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Produced Quantity', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PF Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02809', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-03-31 10:48:34', 'parenttype': 'DocType', 'fieldname': 'produced_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2009-08-31 15:17:39', 'doctype': 'DocField', 'oldfieldname': 'start_date', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 0, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Start Date', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 0, 'description': None, 'parent': 'PF Detail', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL02810', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-03-31 10:48:34', 'parenttype': 'DocType', 'fieldname': 'start_date', 'fieldtype': 'Date', 'options': None, 'report_hide': 0, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2009-08-31 15:17:39', 'doctype': 'DocField', 'oldfieldname': 'end_date', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 0, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'End Date', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 0, 'description': None, 'parent': 'PF Detail', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL02811', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-03-31 10:48:34', 'parenttype': 'DocType', 'fieldname': 'end_date', 'fieldtype': 'Date', 'options': None, 'report_hide': 0, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2009-08-31 15:17:39', 'doctype': 'DocField', 'oldfieldname': 'forecast_date', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Forecast Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'PF Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02812', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-03-31 10:48:34', 'parenttype': 'DocType', 'fieldname': 'forecast_date', 'fieldtype': 'Date', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2009-08-31 15:17:39', 'doctype': 'DocField', 'oldfieldname': 'forecast_due_date', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Forecast Due Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'PF Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02813', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-03-31 10:48:34', 'parenttype': 'DocType', 'fieldname': 'forecast_due_date', 'fieldtype': 'Date', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, PF Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:12',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'PFD/.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Production',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'version': 1
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'PF Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'PF Detail',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'role': 'System Manager'
+	},
+
+	# DocType, PF Detail
+	{
+		'doctype': 'DocType',
+		'name': 'PF Detail'
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'in_filter': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client',
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 2,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'permlevel': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'planned_qty',
+		'fieldtype': 'Currency',
+		'idx': 5,
+		'label': 'Planned Quantity',
+		'oldfieldname': 'planned_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'produced_qty',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'label': 'Produced Quantity',
+		'oldfieldname': 'produced_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'start_date',
+		'fieldtype': 'Date',
+		'hidden': 0,
+		'idx': 7,
+		'in_filter': 0,
+		'label': 'Start Date',
+		'oldfieldname': 'start_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'report_hide': 0,
+		'reqd': 1,
+		'search_index': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'end_date',
+		'fieldtype': 'Date',
+		'hidden': 0,
+		'idx': 8,
+		'in_filter': 0,
+		'label': 'End Date',
+		'oldfieldname': 'end_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'report_hide': 0,
+		'reqd': 1,
+		'search_index': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'qty',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'label': 'Quantity',
+		'oldfieldname': 'qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'forecast_date',
+		'fieldtype': 'Date',
+		'hidden': 1,
+		'idx': 9,
+		'label': 'Forecast Date',
+		'oldfieldname': 'forecast_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'forecast_due_date',
+		'fieldtype': 'Date',
+		'hidden': 1,
+		'idx': 10,
+		'label': 'Forecast Due Date',
+		'oldfieldname': 'forecast_due_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_uom',
+		'fieldtype': 'Data',
+		'idx': 12,
+		'label': 'Stock UOM',
+		'oldfieldname': 'stock_uom',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/production/doctype/pp_detail/pp_detail.txt b/production/doctype/pp_detail/pp_detail.txt
index 342adfa564..61a34bdf76 100644
--- a/production/doctype/pp_detail/pp_detail.txt
+++ b/production/doctype/pp_detail/pp_detail.txt
@@ -1 +1,248 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-08-31 15:17:51', 'search_fields': None, 'module': 'Production', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 21, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'PPID/.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'jai@webnotestech.com', 'document_type': None, 'name': 'PP Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-01-28 15:19:56', 'doctype': 'DocField', 'oldfieldname': 'source_doctype', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Against Document ', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PP Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03872', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-07-19 11:35:48', 'parenttype': 'DocType', 'fieldname': 'source_doctype', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-01-28 15:19:56', 'doctype': 'DocField', 'oldfieldname': 'source_docname', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Document No', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PP Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03873', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-07-19 11:35:48', 'parenttype': 'DocType', 'fieldname': 'source_docname', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-01-28 15:19:56', 'doctype': 'DocField', 'oldfieldname': 'source_detail_docname', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Document Detail No', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'PP Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03874', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-07-19 11:35:48', 'parenttype': 'DocType', 'fieldname': 'source_detail_docname', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-09-26 13:40:26', 'doctype': 'DocField', 'oldfieldname': 'parent_item', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Parent Item', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PP Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03095', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-07-19 11:35:48', 'parenttype': 'DocType', 'fieldname': 'parent_item', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-08-31 15:17:51', 'doctype': 'DocField', 'oldfieldname': 'item_code', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Item Code', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PP Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02847', 'idx': 5, 'default': None, 'colour': 'White:FFF', 'modified': '2010-07-19 11:35:48', 'parenttype': 'DocType', 'fieldname': 'item_code', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2009-08-31 15:17:51', 'doctype': 'DocField', 'oldfieldname': 'document_date', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Document Date', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PP Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02848', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-07-19 11:35:48', 'parenttype': 'DocType', 'fieldname': 'document_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2009-08-31 15:17:51', 'doctype': 'DocField', 'oldfieldname': 'confirmation_date', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Confirmed Delivery Date', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PP Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02849', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-07-19 11:35:48', 'parenttype': 'DocType', 'fieldname': 'confirmation_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-08-31 15:17:51', 'doctype': 'DocField', 'oldfieldname': 'bom_no', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'BOM No', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PP Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02850', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-07-19 11:35:48', 'parenttype': 'DocType', 'fieldname': 'bom_no', 'fieldtype': 'Link', 'options': 'Bill Of Materials', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-08-31 15:17:51', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Description', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PP Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02851', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-07-19 11:35:48', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-08-31 15:17:51', 'doctype': 'DocField', 'oldfieldname': 'stock_uom', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Stock UOM', 'width': '', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PP Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02852', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-07-19 11:35:48', 'parenttype': 'DocType', 'fieldname': 'stock_uom', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:17:51', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_reqd_qty', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Total Reqd Qty', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PP Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02853', 'idx': 11, 'default': '0.00', 'colour': None, 'modified': '2010-07-19 11:35:48', 'parenttype': 'DocType', 'fieldname': 'prevdoc_reqd_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:17:52', 'doctype': 'DocField', 'oldfieldname': 'planned_qty', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Planned Quantity', 'width': '180px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PP Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02857', 'idx': 12, 'default': '0.00', 'colour': None, 'modified': '2010-07-19 11:35:48', 'parenttype': 'DocType', 'fieldname': 'planned_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:17:52', 'doctype': 'DocField', 'oldfieldname': 'produced_qty', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Produced Qty', 'width': '130px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'PP Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02858', 'idx': 13, 'default': '0.00', 'colour': None, 'modified': '2010-07-19 11:35:48', 'parenttype': 'DocType', 'fieldname': 'produced_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Check', 'creation': '2010-02-18 12:45:30', 'doctype': 'DocField', 'oldfieldname': 'pro_created', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'PRO Created', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PP Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03990', 'idx': 14, 'default': None, 'colour': None, 'modified': '2010-07-19 11:35:48', 'parenttype': 'DocType', 'fieldname': 'pro_created', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Check', 'creation': '2009-08-31 15:17:52', 'doctype': 'DocField', 'oldfieldname': 'mrp', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Already MRP Considered', 'width': '140px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'PP Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02859', 'idx': 15, 'default': None, 'colour': None, 'modified': '2010-07-19 11:35:48', 'parenttype': 'DocType', 'fieldname': 'mrp', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, PP Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:12',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'PPID/.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Production',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 21
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'PP Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, PP Detail
+	{
+		'doctype': 'DocType',
+		'name': 'PP Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'source_doctype',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Against Document ',
+		'oldfieldname': 'source_doctype',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'source_docname',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Document No',
+		'oldfieldname': 'source_docname',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'source_detail_docname',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 3,
+		'label': 'Document Detail No',
+		'oldfieldname': 'source_detail_docname',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'parent_item',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'label': 'Parent Item',
+		'oldfieldname': 'parent_item',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'document_date',
+		'fieldtype': 'Date',
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Document Date',
+		'oldfieldname': 'document_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'confirmation_date',
+		'fieldtype': 'Date',
+		'idx': 7,
+		'in_filter': 1,
+		'label': 'Confirmed Delivery Date',
+		'oldfieldname': 'confirmation_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'bom_no',
+		'fieldtype': 'Link',
+		'idx': 8,
+		'label': 'BOM No',
+		'oldfieldname': 'bom_no',
+		'oldfieldtype': 'Link',
+		'options': 'Bill Of Materials',
+		'permlevel': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 9,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'permlevel': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_reqd_qty',
+		'fieldtype': 'Currency',
+		'idx': 11,
+		'label': 'Total Reqd Qty',
+		'oldfieldname': 'prevdoc_reqd_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'reqd': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_uom',
+		'fieldtype': 'Data',
+		'idx': 12,
+		'label': 'Stock UOM',
+		'oldfieldname': 'stock_uom',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'planned_qty',
+		'fieldtype': 'Currency',
+		'idx': 12,
+		'label': 'Planned Quantity',
+		'oldfieldname': 'planned_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1,
+		'width': '180px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'produced_qty',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 13,
+		'label': 'Produced Qty',
+		'oldfieldname': 'produced_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'width': '130px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'pro_created',
+		'fieldtype': 'Check',
+		'idx': 14,
+		'label': 'PRO Created',
+		'oldfieldname': 'pro_created',
+		'oldfieldtype': 'Check',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'mrp',
+		'fieldtype': 'Check',
+		'hidden': 1,
+		'idx': 15,
+		'label': 'Already MRP Considered',
+		'oldfieldname': 'mrp',
+		'oldfieldtype': 'Check',
+		'permlevel': 1,
+		'width': '140px'
+	}
+]
\ No newline at end of file
diff --git a/production/doctype/pp_so_detail/pp_so_detail.txt b/production/doctype/pp_so_detail/pp_so_detail.txt
index d5f798db94..0dd09ddd77 100644
--- a/production/doctype/pp_so_detail/pp_so_detail.txt
+++ b/production/doctype/pp_so_detail/pp_so_detail.txt
@@ -1 +1,131 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-08-31 15:17:45', 'search_fields': None, 'module': 'Production', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 2, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'PP/.SO/.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'jai@webnotestech.com', 'document_type': None, 'name': 'PP SO Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'jai@webnotestech.com', 'name': 'PERM00392', 'parent': 'PP SO Detail', 'read': 1, 'create': None, 'creation': '2009-08-31 15:17:45', 'modified': '2010-01-27 16:32:43', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'jai@webnotestech.com', 'name': 'PERM00393', 'parent': 'PP SO Detail', 'read': 1, 'create': None, 'creation': '2009-08-31 15:17:45', 'modified': '2010-01-27 16:32:43', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-08-31 15:17:45', 'doctype': 'DocField', 'oldfieldname': 'prevdoc', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Against Document', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PP SO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02836', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-01-27 16:32:43', 'parenttype': 'DocType', 'fieldname': 'prevdoc', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-08-31 15:17:45', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_docname', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Document No', 'width': '150px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PP SO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02837', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-01-27 16:32:43', 'parenttype': 'DocType', 'fieldname': 'prevdoc_docname', 'fieldtype': 'Data', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2009-08-31 15:17:45', 'doctype': 'DocField', 'oldfieldname': 'document_date', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Document Date', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PP SO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02838', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-01-27 16:32:43', 'parenttype': 'DocType', 'fieldname': 'document_date', 'fieldtype': 'Date', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-01-27 16:09:09', 'doctype': 'DocField', 'oldfieldname': 'confirmation_date', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Confirmation Date', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PP SO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03852', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-01-27 16:32:43', 'parenttype': 'DocType', 'fieldname': 'confirmation_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Check', 'creation': '2009-08-31 15:17:45', 'doctype': 'DocField', 'oldfieldname': 'include_in_plan', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Include In Plan', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PP SO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02840', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-01-27 16:32:43', 'parenttype': 'DocType', 'fieldname': 'include_in_plan', 'fieldtype': 'Check', 'options': '', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, PP SO Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:13',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'PP/.SO/.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Production',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 2
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'PP SO Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'PP SO Detail',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'role': 'System Manager'
+	},
+
+	# DocType, PP SO Detail
+	{
+		'doctype': 'DocType',
+		'name': 'PP SO Detail'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Against Document',
+		'oldfieldname': 'prevdoc',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_docname',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Document No',
+		'oldfieldname': 'prevdoc_docname',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'document_date',
+		'fieldtype': 'Date',
+		'idx': 3,
+		'label': 'Document Date',
+		'oldfieldname': 'document_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'confirmation_date',
+		'fieldtype': 'Date',
+		'idx': 5,
+		'label': 'Confirmation Date',
+		'oldfieldname': 'confirmation_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'include_in_plan',
+		'fieldtype': 'Check',
+		'idx': 6,
+		'label': 'Include In Plan',
+		'oldfieldname': 'include_in_plan',
+		'oldfieldtype': 'Check',
+		'permlevel': 0,
+		'width': '100px'
+	}
+]
\ No newline at end of file
diff --git a/production/doctype/ppw_detail/ppw_detail.txt b/production/doctype/ppw_detail/ppw_detail.txt
index ffb9ce63dc..96bcf85714 100644
--- a/production/doctype/ppw_detail/ppw_detail.txt
+++ b/production/doctype/ppw_detail/ppw_detail.txt
@@ -1 +1,52 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-08-31 15:17:49', 'search_fields': None, 'module': 'Production', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 1, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'PPWD/.#######', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'PPW Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-08-31 15:17:49', 'doctype': 'DocField', 'oldfieldname': 'warehouse', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Warehouse', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PPW Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02843', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-03-31 10:48:47', 'parenttype': 'DocType', 'fieldname': 'warehouse', 'fieldtype': 'Link', 'options': 'Warehouse', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, PPW Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:13',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'PPWD/.#######',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'Production',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'version': 1
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'warehouse',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Warehouse',
+		'name': '__common__',
+		'oldfieldname': 'warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'parent': 'PPW Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, PPW Detail
+	{
+		'doctype': 'DocType',
+		'name': 'PPW Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField'
+	}
+]
\ No newline at end of file
diff --git a/production/doctype/pro_detail/pro_detail.txt b/production/doctype/pro_detail/pro_detail.txt
index 4710cd5287..df7465e4fe 100644
--- a/production/doctype/pro_detail/pro_detail.txt
+++ b/production/doctype/pro_detail/pro_detail.txt
@@ -1 +1,157 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-08-31 15:17:58', 'search_fields': None, 'module': 'Production', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 4, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'PRODC/.#######', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'jai@webnotestech.com', 'document_type': None, 'name': 'PRO Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-08-31 15:17:58', 'doctype': 'DocField', 'oldfieldname': 'item_code', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Item Code', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PRO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02886', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-02-08 17:24:46', 'parenttype': 'DocType', 'fieldname': 'item_code', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-08-31 15:17:58', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PRO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02887', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-02-08 17:24:46', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-08-31 15:17:58', 'doctype': 'DocField', 'oldfieldname': 'source_warehouse', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Source Warehouse', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PRO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02888', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-02-08 17:24:46', 'parenttype': 'DocType', 'fieldname': 'source_warehouse', 'fieldtype': 'Link', 'options': 'Warehouse', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:17:58', 'doctype': 'DocField', 'oldfieldname': 'actual_qty', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Current Stock', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PRO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02889', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-02-08 17:24:46', 'parenttype': 'DocType', 'fieldname': 'actual_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-08-31 15:17:58', 'doctype': 'DocField', 'oldfieldname': 'stock_uom', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Stock UOM', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PRO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02890', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-02-08 17:24:46', 'parenttype': 'DocType', 'fieldname': 'stock_uom', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:17:58', 'doctype': 'DocField', 'oldfieldname': 'qty_reqd', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Qty Reqd', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PRO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02891', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-02-08 17:24:46', 'parenttype': 'DocType', 'fieldname': 'qty_reqd', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:17:58', 'doctype': 'DocField', 'oldfieldname': 'issued_qty', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Issued Qty', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PRO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02892', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-02-08 17:24:46', 'parenttype': 'DocType', 'fieldname': 'issued_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:17:58', 'doctype': 'DocField', 'oldfieldname': 'consumed_qty', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Consumed Qty', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PRO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02893', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-02-08 17:24:46', 'parenttype': 'DocType', 'fieldname': 'consumed_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-02-08 15:21:40', 'doctype': 'DocField', 'oldfieldname': 'qty_consumed_per_unit', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Qty Consumed Per Unit', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PRO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03957', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-02-08 17:24:46', 'parenttype': 'DocType', 'fieldname': 'qty_consumed_per_unit', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, PRO Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:13',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'PRODC/.#######',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Production',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'version': 4
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'PRO Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, PRO Detail
+	{
+		'doctype': 'DocType',
+		'name': 'PRO Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 2,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'permlevel': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'source_warehouse',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'label': 'Source Warehouse',
+		'oldfieldname': 'source_warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'actual_qty',
+		'fieldtype': 'Currency',
+		'idx': 4,
+		'label': 'Current Stock',
+		'oldfieldname': 'actual_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'qty_reqd',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'label': 'Qty Reqd',
+		'oldfieldname': 'qty_reqd',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'issued_qty',
+		'fieldtype': 'Currency',
+		'idx': 7,
+		'label': 'Issued Qty',
+		'oldfieldname': 'issued_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'consumed_qty',
+		'fieldtype': 'Currency',
+		'idx': 8,
+		'label': 'Consumed Qty',
+		'oldfieldname': 'consumed_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'qty_consumed_per_unit',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'label': 'Qty Consumed Per Unit',
+		'oldfieldname': 'qty_consumed_per_unit',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_uom',
+		'fieldtype': 'Data',
+		'idx': 12,
+		'label': 'Stock UOM',
+		'oldfieldname': 'stock_uom',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'reqd': 1
+	}
+]
\ No newline at end of file
diff --git a/production/doctype/pro_pp_detail/pro_pp_detail.txt b/production/doctype/pro_pp_detail/pro_pp_detail.txt
index b7ed649710..042ec1a966 100644
--- a/production/doctype/pro_pp_detail/pro_pp_detail.txt
+++ b/production/doctype/pro_pp_detail/pro_pp_detail.txt
@@ -1 +1,129 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-10-16 16:29:24', 'search_fields': None, 'module': 'Production', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'jai@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 5, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'jai@webnotestech.com', 'document_type': None, 'name': 'PRO PP Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-10-16 16:34:49', 'doctype': 'DocField', 'oldfieldname': 'source_doctype', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Source Doctype', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PRO PP Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03242', 'idx': 1, 'default': None, 'colour': None, 'modified': '2009-11-02 01:01:26', 'parenttype': 'DocType', 'fieldname': 'source_doctype', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-10-16 16:34:49', 'doctype': 'DocField', 'oldfieldname': 'source_docname', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Source Docname', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PRO PP Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03243', 'idx': 2, 'default': None, 'colour': None, 'modified': '2009-11-02 01:01:26', 'parenttype': 'DocType', 'fieldname': 'source_docname', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-02 01:01:26', 'doctype': 'DocField', 'oldfieldname': 'source_detail_docname', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Source Detail Docname ', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PRO PP Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03264', 'idx': 3, 'default': None, 'colour': None, 'modified': '2009-11-02 01:01:26', 'parenttype': 'DocType', 'fieldname': 'source_detail_docname', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-10-16 16:34:49', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_detail_docname', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Prevdoc Detail Docname', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PRO PP Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03246', 'idx': 4, 'default': None, 'colour': None, 'modified': '2009-11-02 01:01:26', 'parenttype': 'DocType', 'fieldname': 'prevdoc_detail_docname', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2009-10-16 16:37:17', 'doctype': 'DocField', 'oldfieldname': 'confirm_date', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Confirm Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PRO PP Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03247', 'idx': 5, 'default': None, 'colour': None, 'modified': '2009-11-02 01:01:26', 'parenttype': 'DocType', 'fieldname': 'confirm_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-10-16 16:37:17', 'doctype': 'DocField', 'oldfieldname': 'qty_reqd', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Qty Reqd', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PRO PP Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03248', 'idx': 6, 'default': None, 'colour': None, 'modified': '2009-11-02 01:01:26', 'parenttype': 'DocType', 'fieldname': 'qty_reqd', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-10-16 16:37:17', 'doctype': 'DocField', 'oldfieldname': 'produced_qty', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Produced Qty', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PRO PP Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03249', 'idx': 7, 'default': None, 'colour': None, 'modified': '2009-11-02 01:01:26', 'parenttype': 'DocType', 'fieldname': 'produced_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Check', 'creation': '2009-10-23 06:54:42', 'doctype': 'DocField', 'oldfieldname': 'update', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Update', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PRO PP Detail', 'search_index': None, 'allow_on_submit': 1, 'icon': None, 'name': 'FL03258', 'idx': 8, 'default': None, 'colour': None, 'modified': '2009-11-02 01:01:26', 'parenttype': 'DocType', 'fieldname': 'update', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, PRO PP Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:13',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'jai@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Production',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'version': 5
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'PRO PP Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, PRO PP Detail
+	{
+		'doctype': 'DocType',
+		'name': 'PRO PP Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'source_doctype',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Source Doctype',
+		'oldfieldname': 'source_doctype',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'source_docname',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Source Docname',
+		'oldfieldname': 'source_docname',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'source_detail_docname',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Source Detail Docname ',
+		'oldfieldname': 'source_detail_docname',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_detail_docname',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'Prevdoc Detail Docname',
+		'oldfieldname': 'prevdoc_detail_docname',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'confirm_date',
+		'fieldtype': 'Date',
+		'idx': 5,
+		'label': 'Confirm Date',
+		'oldfieldname': 'confirm_date',
+		'oldfieldtype': 'Date'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'qty_reqd',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'label': 'Qty Reqd',
+		'oldfieldname': 'qty_reqd',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'produced_qty',
+		'fieldtype': 'Currency',
+		'idx': 7,
+		'label': 'Produced Qty',
+		'oldfieldname': 'produced_qty',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'update',
+		'fieldtype': 'Check',
+		'idx': 8,
+		'label': 'Update',
+		'oldfieldname': 'update',
+		'oldfieldtype': 'Check'
+	}
+]
\ No newline at end of file
diff --git a/production/doctype/production_control/production_control.txt b/production/doctype/production_control/production_control.txt
index d738273bdc..7ca5160e27 100644
--- a/production/doctype/production_control/production_control.txt
+++ b/production/doctype/production_control/production_control.txt
@@ -1 +1,31 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-09-07 18:57:06', 'search_fields': None, 'module': 'Production', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 19, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': None, 'name': 'Production Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
+# DocType, Production Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:14',
+		'docstatus': 0,
+		'modified': '2010-12-23 11:22:14',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Production',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 19
+	},
+
+	# DocType, Production Control
+	{
+		'doctype': 'DocType',
+		'name': 'Production Control'
+	}
+]
\ No newline at end of file
diff --git a/production/doctype/production_order/production_order.txt b/production/doctype/production_order/production_order.txt
index 83697320c3..7df63971d4 100644
--- a/production/doctype/production_order/production_order.txt
+++ b/production/doctype/production_order/production_order.txt
@@ -1 +1,467 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-08-31 15:17:54', 'search_fields': None, 'module': 'Production', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 0, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 182, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': '', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': None, 'name': 'Production Order', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 1, 'amend': 1, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00394', 'parent': 'Production Order', 'read': 1, 'create': 1, 'creation': '2009-08-31 15:17:54', 'modified': '2010-08-19 14:33:20', 'submit': 1, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00395', 'parent': 'Production Order', 'read': 1, 'create': None, 'creation': '2009-08-31 15:17:54', 'modified': '2010-08-19 14:33:20', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'All', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': 1, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00396', 'parent': 'Production Order', 'read': 1, 'create': 1, 'creation': '2009-08-31 15:17:54', 'modified': '2010-08-19 14:33:20', 'submit': 1, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'Production Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': 1, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00397', 'parent': 'Production Order', 'read': 1, 'create': 1, 'creation': '2009-08-31 15:17:54', 'modified': '2010-08-19 14:33:20', 'submit': 1, 'doctype': 'DocPerm', 'write': 1, 'idx': 4, 'parenttype': 'DocType', 'role': 'Production User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2009-08-31 15:17:54', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Production Order', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02860', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-02-08 12:00:59', 'doctype': 'DocField', 'oldfieldname': 'transaction_date', 'owner': 'jai@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Transaction Date', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'The date on which current entry is made in system.', 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03955', 'idx': 2, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': 'transaction_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-03-26 10:51:33', 'doctype': 'DocField', 'oldfieldname': 'posting_date', 'owner': 'jai@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Posting Date', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'The date on which current entry will get or has actually executed.', 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04143', 'idx': 3, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': 'posting_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-08-31 15:17:55', 'doctype': 'DocField', 'oldfieldname': 'production_item', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Production Item', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': 'Item for which this Production Order is raised.', 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02867', 'idx': 4, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': 'production_item', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-08-31 15:17:55', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02868', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:17:55', 'doctype': 'DocField', 'oldfieldname': 'qty', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Qty', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Quantity of item for which Production Order is raised.', 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02871', 'idx': 6, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': 'qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-08-31 15:17:55', 'doctype': 'DocField', 'oldfieldname': 'bom_no', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'BOM No', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': 'Bill of Material which was considered for manufacturing the production item.', 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02869', 'idx': 7, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': 'bom_no', 'fieldtype': 'Link', 'options': 'Bill Of Materials', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Select', 'creation': '2009-08-31 15:17:54', 'doctype': 'DocField', 'oldfieldname': 'origin', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Origin', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02862', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': 'origin', 'fieldtype': 'Select', 'options': 'Manual\nMRP', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-08-19 14:33:20', 'doctype': 'DocField', 'oldfieldname': 'project_name', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Project Name', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Select name of the project if Production Order need to be created against any project', 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05953', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': 'project_name', 'fieldtype': 'Link', 'options': 'Project', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-08-13 18:32:58', 'doctype': 'DocField', 'oldfieldname': 'amended_from', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Amended From', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05909', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': 'amended_from', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-08-13 18:32:58', 'doctype': 'DocField', 'oldfieldname': 'amendment_date', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Amendment Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05910', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': 'amendment_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Column Break', 'creation': '2010-07-23 09:30:26', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': '', 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05679', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Select', 'creation': '2009-08-31 15:17:54', 'doctype': 'DocField', 'oldfieldname': 'status', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Status', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Production Order', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02866', 'idx': 13, 'default': None, 'colour': None, 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': 'status', 'fieldtype': 'Select', 'options': '\nDraft\nSubmitted\nStopped\nIn Process\nCompleted\nCancelled', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-02-18 21:35:51', 'doctype': 'DocField', 'oldfieldname': 'fg_warehouse', 'owner': 'jai@webnotestech.com', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'FG Warehouse', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'The warehouse for finished goods where stock of produced items will be updated.', 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03995', 'idx': 14, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': 'fg_warehouse', 'fieldtype': 'Link', 'options': 'Warehouse', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-08-31 15:17:55', 'doctype': 'DocField', 'oldfieldname': 'wip_warehouse', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'WIP Warehouse', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'The work in progress warehouse where raw materials will be operated upon to create finished goods.', 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02876', 'idx': 15, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': 'wip_warehouse', 'fieldtype': 'Link', 'options': 'Warehouse', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-02-18 07:33:36', 'doctype': 'DocField', 'oldfieldname': 'consider_sa_items', 'owner': 'jai@webnotestech.com', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Consider SA Items', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': 'Select "Yes" if stock is maintained and tracked for sub - assembly items.', 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03989', 'idx': 16, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': 'consider_sa_items', 'fieldtype': 'Select', 'options': '\nYes\nNo', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-08-31 15:17:55', 'doctype': 'DocField', 'oldfieldname': 'stock_uom', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Stock UOM', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02870', 'idx': 17, 'default': None, 'colour': None, 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': 'stock_uom', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-02-03 12:34:21', 'doctype': 'DocField', 'oldfieldname': 'produced_qty', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Produced Qty (Updated after finished goods are transferred to FG Warehouse through Stock Entry)', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': '', 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03920', 'idx': 18, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': 'produced_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-08-31 15:17:55', 'doctype': 'DocField', 'oldfieldname': 'company', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Company', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02883', 'idx': 19, 'default': None, 'colour': None, 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': 'company', 'fieldtype': 'Link', 'options': 'Company', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-08-31 15:17:55', 'doctype': 'DocField', 'oldfieldname': 'fiscal_year', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Fiscal Year', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02885', 'idx': 20, 'default': None, 'colour': None, 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': 'fiscal_year', 'fieldtype': 'Select', 'options': 'link:Fiscal Year', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-02-18 15:06:52', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Next Steps', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03993', 'idx': 21, 'default': None, 'colour': None, 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2010-02-18 14:51:05', 'doctype': 'DocField', 'oldfieldname': '', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Material Transfer', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': 1, 'icon': None, 'name': 'FL03991', 'idx': 22, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Button', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Column Break', 'creation': '2010-02-18 15:06:52', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03994', 'idx': 23, 'default': None, 'colour': None, 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2010-02-18 14:51:05', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Backflush', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': 1, 'icon': None, 'name': 'FL03992', 'idx': 24, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Column Break', 'creation': '2010-02-18 21:40:49', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03996', 'idx': 25, 'default': None, 'colour': None, 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2010-02-08 12:00:26', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Stop Production Order', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': 1, 'icon': None, 'name': 'FL03953', 'idx': 26, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2010-02-08 12:00:26', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Unstop Production Order', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Order', 'search_index': None, 'allow_on_submit': 1, 'icon': None, 'name': 'FL03954', 'idx': 27, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-19 14:33:20', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Production Order
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:14',
+		'docstatus': 0,
+		'modified': '2010-12-23 11:08:12',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 0,
+		'module': 'Production',
+		'name': '__common__',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 179
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Production Order',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Production Order',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Production Order
+	{
+		'doctype': 'DocType',
+		'name': 'Production Order'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'All'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'Production Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Production User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Production Order',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'The date on which current entry is made in system.',
+		'doctype': 'DocField',
+		'fieldname': 'transaction_date',
+		'fieldtype': 'Date',
+		'idx': 2,
+		'label': 'Transaction Date',
+		'oldfieldname': 'transaction_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'The date on which current entry will get or has actually executed.',
+		'doctype': 'DocField',
+		'fieldname': 'posting_date',
+		'fieldtype': 'Date',
+		'idx': 3,
+		'label': 'Posting Date',
+		'oldfieldname': 'posting_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Item for which this Production Order is raised.',
+		'doctype': 'DocField',
+		'fieldname': 'production_item',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Production Item',
+		'oldfieldname': 'production_item',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 1,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 5,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Bill of Material which was considered for manufacturing the production item.',
+		'doctype': 'DocField',
+		'fieldname': 'bom_no',
+		'fieldtype': 'Link',
+		'idx': 7,
+		'label': 'BOM No',
+		'oldfieldname': 'bom_no',
+		'oldfieldtype': 'Link',
+		'options': 'Bill Of Materials',
+		'permlevel': 1,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'origin',
+		'fieldtype': 'Select',
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'Origin',
+		'no_copy': 1,
+		'oldfieldname': 'origin',
+		'oldfieldtype': 'Select',
+		'options': 'Manual\nMRP',
+		'permlevel': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Quantity of item for which Production Order is raised.',
+		'doctype': 'DocField',
+		'fieldname': 'qty',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'label': 'Qty',
+		'oldfieldname': 'qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'description': 'Select name of the project if Production Order need to be created against any project',
+		'doctype': 'DocField',
+		'fieldname': 'project_name',
+		'fieldtype': 'Link',
+		'idx': 9,
+		'in_filter': 1,
+		'label': 'Project Name',
+		'oldfieldname': 'project_name',
+		'oldfieldtype': 'Link',
+		'options': 'Project',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'idx': 10,
+		'label': 'Amended From',
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'idx': 11,
+		'label': 'Amendment Date',
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 12,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_uom',
+		'fieldtype': 'Data',
+		'idx': 12,
+		'label': 'Stock UOM',
+		'oldfieldname': 'stock_uom',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Select',
+		'idx': 13,
+		'in_filter': 1,
+		'label': 'Status',
+		'no_copy': 1,
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Select',
+		'options': '\nDraft\nSubmitted\nStopped\nIn Process\nCompleted\nCancelled',
+		'permlevel': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'The warehouse for finished goods where stock of produced items will be updated.',
+		'doctype': 'DocField',
+		'fieldname': 'fg_warehouse',
+		'fieldtype': 'Link',
+		'idx': 14,
+		'in_filter': 1,
+		'label': 'FG Warehouse',
+		'oldfieldname': 'fg_warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'The work in progress warehouse where raw materials will be operated upon to create finished goods.',
+		'doctype': 'DocField',
+		'fieldname': 'wip_warehouse',
+		'fieldtype': 'Link',
+		'idx': 15,
+		'in_filter': 1,
+		'label': 'WIP Warehouse',
+		'oldfieldname': 'wip_warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Select "Yes" if stock is maintained and tracked for sub - assembly items.',
+		'doctype': 'DocField',
+		'fieldname': 'consider_sa_items',
+		'fieldtype': 'Select',
+		'idx': 16,
+		'in_filter': 1,
+		'label': 'Consider SA Items',
+		'oldfieldname': 'consider_sa_items',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'produced_qty',
+		'fieldtype': 'Currency',
+		'idx': 18,
+		'label': 'Produced Qty (Updated after finished goods are transferred to FG Warehouse through Stock Entry)',
+		'oldfieldname': 'produced_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 19,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 20,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 21,
+		'label': 'Next Steps',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 22,
+		'label': 'Material Transfer',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 23,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 24,
+		'label': 'Backflush',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 25,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 26,
+		'label': 'Stop Production Order',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 27,
+		'label': 'Unstop Production Order',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	}
+]
\ No newline at end of file
diff --git a/production/doctype/production_planning_tool/production_planning_tool.txt b/production/doctype/production_planning_tool/production_planning_tool.txt
index dca2150aa5..516dba8ff3 100644
--- a/production/doctype/production_planning_tool/production_planning_tool.txt
+++ b/production/doctype/production_planning_tool/production_planning_tool.txt
@@ -1 +1,330 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2010-01-29 14:56:20', 'search_fields': None, 'module': 'Production', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'jai@webnotestech.com', 'in_dialog': None, 'in_create': 1, 'read_only': 1, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 1, 'max_attachments': None, 'version': 89, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'jai@webnotestech.com', 'document_type': None, 'name': 'Production Planning Tool', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'jai@webnotestech.com', 'name': 'PERM00669', 'parent': 'Production Planning Tool', 'read': 1, 'create': 1, 'creation': '2010-02-12 12:21:09', 'modified': '2010-08-13 17:59:00', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'jai@webnotestech.com', 'name': 'PERM01004', 'parent': 'Production Planning Tool', 'read': 1, 'create': 1, 'creation': '2010-05-19 16:55:18', 'modified': '2010-08-13 17:59:00', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'Production User', 'owner': 'saumil@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'jai@webnotestech.com', 'name': 'PERM01005', 'parent': 'Production Planning Tool', 'read': 1, 'create': 1, 'creation': '2010-05-19 16:55:18', 'modified': '2010-08-13 17:59:00', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'Production Manager', 'owner': 'saumil@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-19 09:58:43', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Find Sales Orders', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Select Sales Orders from which you want to create Production Orders. Enter the From and To Dates to get Open Orders in that period.', 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04007', 'idx': 1, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-19 09:58:43', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'From Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04008', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': 'from_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-19 09:58:43', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'To Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04009', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': 'to_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-19 12:43:51', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': '', 'width': '40%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04014', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-19 09:58:43', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Get Open Documents', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04010', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'get_open_docs', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-19 12:43:51', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04015', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': 'Simple', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-23 10:50:30', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Clear Document Table', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04042', 'idx': 7, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-19 09:58:43', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'PP SO Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04011', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': 'pp_so_details', 'fieldtype': 'Table', 'options': 'PP SO Detail', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-19 12:44:44', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04018', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': 'Simple', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-12 11:58:55', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Sales Order', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03972', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': 'sales_order', 'fieldtype': 'Link', 'options': 'Sales Order', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-12 11:58:55', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Production Forecast', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03973', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': 'production_forecast', 'fieldtype': 'Link', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-19 12:43:51', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': '', 'width': '40%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04016', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-19 12:43:51', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Add In Plan', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04017', 'idx': 13, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'pull_document', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-29 15:03:29', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Items', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Click on "Get Items" to get un-fulfilled items from your Sales Orders. After setting the quantities you can raise Production Orders or download the material requirements for analysis', 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03904', 'idx': 14, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-29 15:03:29', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Get Items', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03905', 'idx': 15, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Button', 'options': 'get_items', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-19 15:08:57', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': '', 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04022', 'idx': 16, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-23 10:51:24', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Clear Item Table', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04043', 'idx': 17, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-19 15:08:57', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04023', 'idx': 18, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': 'Simple', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-18 06:31:46', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Consider Sub Assemblies', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Select "Yes" if stock is maintained and tracked for sub assembly items.', 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03983', 'idx': 19, 'default': 'No', 'colour': 'White:FFF', 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': 'consider_sa_items', 'fieldtype': 'Select', 'options': 'No\nYes', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-29 15:03:29', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'PP Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03906', 'idx': 20, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': 'pp_details', 'fieldtype': 'Table', 'options': 'PP Detail', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-18 06:34:43', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03984', 'idx': 21, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': 'Simple', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-18 06:34:43', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Raise Production Order', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03985', 'idx': 22, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'raise_production_order', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-18 06:34:43', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': '', 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03986', 'idx': 23, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-12 17:16:33', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Download Raw Material Report', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03975', 'idx': 24, 'default': None, 'colour': 'White:FFF', 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Button', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-02-18 06:34:43', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Company Info', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03987', 'idx': 25, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-29 14:56:20', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Fiscal Year', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03896', 'idx': 26, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': 'fiscal_year', 'fieldtype': 'Select', 'options': 'Link:Fiscal Year', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-01-29 14:56:20', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Company', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Production Planning Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03895', 'idx': 27, 'default': None, 'colour': None, 'modified': '2010-08-13 17:59:00', 'parenttype': 'DocType', 'fieldname': 'company', 'fieldtype': 'Link', 'options': 'Company', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Production Planning Tool
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:14',
+		'docstatus': 0,
+		'modified': '2010-12-30 14:49:58',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'jai@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1294312191',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 1,
+		'issingle': 1,
+		'module': 'Production',
+		'name': '__common__',
+		'read_only': 1,
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 1,
+		'version': 87
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Production Planning Tool',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Production Planning Tool',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'write': 1
+	},
+
+	# DocType, Production Planning Tool
+	{
+		'doctype': 'DocType',
+		'name': 'Production Planning Tool'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'Production User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'role': 'Production Manager'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Select Sales Orders from which you want to create Production Orders. Enter the From and To Dates to get Open Orders in that period.',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Find Sales Orders'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'from_date',
+		'fieldtype': 'Date',
+		'idx': 2,
+		'label': 'From Date'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'to_date',
+		'fieldtype': 'Date',
+		'idx': 3,
+		'label': 'To Date'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 4,
+		'width': '40%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 5,
+		'label': 'Get Open Documents',
+		'options': 'get_open_docs'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 6,
+		'options': 'Simple'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 7,
+		'label': 'Clear Document Table',
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'pp_so_details',
+		'fieldtype': 'Table',
+		'idx': 8,
+		'label': 'PP SO Details',
+		'options': 'PP SO Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 9,
+		'options': 'Simple'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sales_order',
+		'fieldtype': 'Link',
+		'idx': 10,
+		'label': 'Sales Order',
+		'options': 'Sales Order'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'production_forecast',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 11,
+		'label': 'Production Forecast',
+		'options': 'Production Forecast'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 12,
+		'width': '40%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 13,
+		'label': 'Add In Plan',
+		'options': 'pull_document'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Click on "Get Items" to get un-fulfilled items from your Sales Orders. After setting the quantities you can raise Production Orders or download the material requirements for analysis',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 14,
+		'label': 'Items'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 15,
+		'label': 'Get Items',
+		'options': 'get_items'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 16,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 17,
+		'label': 'Clear Item Table',
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 18,
+		'options': 'Simple'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'No',
+		'description': 'Select "Yes" if stock is maintained and tracked for sub assembly items.',
+		'doctype': 'DocField',
+		'fieldname': 'consider_sa_items',
+		'fieldtype': 'Select',
+		'idx': 19,
+		'label': 'Consider Sub Assemblies',
+		'options': 'No\nYes',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'pp_details',
+		'fieldtype': 'Table',
+		'idx': 20,
+		'label': 'PP Details',
+		'options': 'PP Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 21,
+		'options': 'Simple'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 22,
+		'label': 'Raise Production Order',
+		'options': 'raise_production_order'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 23,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 24,
+		'label': 'Download Raw Material Report',
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 25,
+		'label': 'Company Info'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 26,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'options': 'Link:Fiscal Year'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 27,
+		'label': 'Company',
+		'options': 'Company'
+	}
+]
\ No newline at end of file
diff --git a/production/doctype/update_delivery_date/update_delivery_date.txt b/production/doctype/update_delivery_date/update_delivery_date.txt
index 9e5ce1f80a..fcd62aaa5c 100644
--- a/production/doctype/update_delivery_date/update_delivery_date.txt
+++ b/production/doctype/update_delivery_date/update_delivery_date.txt
@@ -1,640 +1,150 @@
+# DocType, Update Delivery Date
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': '1300960466',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-11-30 22:42:48',
-		'description': None,
+		'creation': '2010-08-08 17:09:29',
 		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': 1,
-		'istable': None,
-		'last_update': '1294161010',
-		'max_attachments': None,
-		'menu_index': None,
 		'modified': '2010-09-20 14:06:57',
 		'modified_by': 'Administrator',
+		'owner': 'jai@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
 		'module': 'Production',
-		'name': 'Update Delivery Date',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
+		'name': '__common__',
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
-		'show_in_menu': None,
-		'smallicon': None,
-		'use_template': None,
-		'version': 6
+		'version': 5
 	},
+
+	# These values are common for all DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:33',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'from_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'From Date',
-		'modified': '2011-03-24 15:58:11',
-		'modified_by': 'Administrator',
-		'name': 'FL00655',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'jai@webnotestech.com',
+		'name': '__common__',
 		'parent': 'Update Delivery Date',
 		'parentfield': 'fields',
 		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# These values are common for all DocPerm
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:42:48',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'from_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'From Date',
-		'modified': '2010-11-30 22:42:48',
-		'modified_by': 'Administrator',
-		'name': 'FL02950',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Update Delivery Date',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:33',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'to_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'To Date',
-		'modified': '2011-03-24 15:58:11',
-		'modified_by': 'Administrator',
-		'name': 'FL00656',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Update Delivery Date',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:42:48',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'to_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'To Date',
-		'modified': '2010-11-30 22:42:48',
-		'modified_by': 'Administrator',
-		'name': 'FL02951',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Update Delivery Date',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:40',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Customer',
-		'modified': '2011-03-24 15:58:11',
-		'modified_by': 'Administrator',
-		'name': 'FL00887',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Customer',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Update Delivery Date',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:42:48',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Customer',
-		'modified': '2010-11-30 22:42:48',
-		'modified_by': 'Administrator',
-		'name': 'FL02952',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Customer',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Update Delivery Date',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:42',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'sales_order',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Sales Order',
-		'modified': '2011-03-24 15:58:11',
-		'modified_by': 'Administrator',
-		'name': 'FL00977',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Sales Order',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Update Delivery Date',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:42:48',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'sales_order',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Sales Order',
-		'modified': '2010-11-30 22:42:48',
-		'modified_by': 'Administrator',
-		'name': 'FL02953',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Sales Order',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Update Delivery Date',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:42:48',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Company',
-		'modified': '2010-11-30 22:42:48',
-		'modified_by': 'Administrator',
-		'name': 'FL02954',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'link:Company',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Update Delivery Date',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-23 11:02:21',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Company',
-		'modified': '2011-03-24 15:58:11',
-		'modified_by': 'Administrator',
-		'name': '000002690',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'link:Company',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Update Delivery Date',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:40',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'territory',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Territory',
-		'modified': '2011-03-24 15:58:11',
-		'modified_by': 'Administrator',
-		'name': 'FL00890',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Territory',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Update Delivery Date',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:42:48',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'territory',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Territory',
-		'modified': '2010-11-30 22:42:48',
-		'modified_by': 'Administrator',
-		'name': 'FL02955',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Territory',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Update Delivery Date',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:42:48',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Get Open Sales Order',
-		'modified': '2011-03-24 15:58:11',
-		'modified_by': 'Administrator',
-		'name': 'FL02956',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'get_open_sales_order',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Update Delivery Date',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:33',
-		'default': 'No Toolbar',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'entries',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Entries',
-		'modified': '2011-03-24 15:58:11',
-		'modified_by': 'Administrator',
-		'name': 'FL00658',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Update Delivery Date Detail',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Update Delivery Date',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:42:48',
-		'default': 'No Toolbar',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'entries',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Entries',
-		'modified': '2010-11-30 22:42:48',
-		'modified_by': 'Administrator',
-		'name': 'FL02957',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Update Delivery Date Detail',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Update Delivery Date',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': ''
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:42:48',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Update Sales Order',
-		'modified': '2011-03-24 15:58:11',
-		'modified_by': 'Administrator',
-		'name': 'FL02958',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'update_sales_order',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Update Delivery Date',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
 		'create': 1,
-		'creation': '2010-11-30 22:42:48',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 1,
-		'match': None,
-		'modified': '2010-11-30 22:42:48',
-		'modified_by': 'Administrator',
-		'name': 'PERM00482',
-		'owner': 'jai@webnotestech.com',
+		'name': '__common__',
 		'parent': 'Update Delivery Date',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
 		'permlevel': 0,
 		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
+		'role': 'System Manager',
 		'write': 1
+	},
+
+	# DocType, Update Delivery Date
+	{
+		'doctype': 'DocType',
+		'name': 'Update Delivery Date'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'from_date',
+		'fieldtype': 'Date',
+		'idx': 1,
+		'label': 'From Date',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'to_date',
+		'fieldtype': 'Date',
+		'idx': 2,
+		'label': 'To Date',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'label': 'Customer',
+		'options': 'Customer'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sales_order',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'label': 'Sales Order',
+		'options': 'Sales Order'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Select',
+		'idx': 5,
+		'label': 'Company',
+		'options': 'link:Company'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'territory',
+		'fieldtype': 'Link',
+		'idx': 6,
+		'label': 'Territory',
+		'options': 'Territory',
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 7,
+		'label': 'Get Open Sales Order',
+		'options': 'get_open_sales_order'
+	},
+
+	# DocField
+	{
+		'default': 'No Toolbar',
+		'doctype': 'DocField',
+		'fieldname': 'entries',
+		'fieldtype': 'Table',
+		'idx': 8,
+		'label': 'Entries',
+		'options': 'Update Delivery Date Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 9,
+		'label': 'Update Sales Order',
+		'options': 'update_sales_order'
 	}
 ]
\ No newline at end of file
diff --git a/production/doctype/update_delivery_date_detail/update_delivery_date_detail.txt b/production/doctype/update_delivery_date_detail/update_delivery_date_detail.txt
index faa65e718f..f8499ce4a7 100644
--- a/production/doctype/update_delivery_date_detail/update_delivery_date_detail.txt
+++ b/production/doctype/update_delivery_date_detail/update_delivery_date_detail.txt
@@ -1 +1,141 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-08-04 09:42:35', 'search_fields': None, 'module': 'Production', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'jai@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 1, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'jai@webnotestech.com', 'document_type': None, 'name': 'Update Delivery Date Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': '', 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-08-04 09:42:35', 'doctype': 'DocField', 'oldfieldname': 'sales_order_no', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Sales Order No', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Update Delivery Date Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05806', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-08-04 09:42:35', 'parenttype': 'DocType', 'fieldname': 'sales_order_no', 'fieldtype': 'Link', 'options': 'Sales Order', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-08-04 09:42:35', 'doctype': 'DocField', 'oldfieldname': 'customer', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Customer', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Update Delivery Date Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05807', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-08-04 09:42:35', 'parenttype': 'DocType', 'fieldname': 'customer', 'fieldtype': 'Data', 'options': 'Customer', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-08-04 09:42:35', 'doctype': 'DocField', 'oldfieldname': 'city', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'City', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Update Delivery Date Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05808', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-08-04 09:42:35', 'parenttype': 'DocType', 'fieldname': 'city', 'fieldtype': 'Data', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-08-04 09:42:35', 'doctype': 'DocField', 'oldfieldname': 'state', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'State', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Update Delivery Date Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05809', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-08-04 09:42:35', 'parenttype': 'DocType', 'fieldname': 'state', 'fieldtype': 'Link', 'options': 'State', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-08-04 09:42:35', 'doctype': 'DocField', 'oldfieldname': 'territory', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'jai@webnotestech.com', 'label': 'Territory', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Update Delivery Date Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05810', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-08-04 09:42:35', 'parenttype': 'DocType', 'fieldname': 'territory', 'fieldtype': 'Link', 'options': 'Territory', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-08-04 09:42:35', 'doctype': 'DocField', 'oldfieldname': 'rounded_total', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Total Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Update Delivery Date Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05811', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-08-04 09:42:35', 'parenttype': 'DocType', 'fieldname': 'rounded_total', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-08-04 09:42:35', 'doctype': 'DocField', 'oldfieldname': 'delivery_date', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Expected Delivery Date', 'width': '', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Update Delivery Date Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05812', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-08-04 09:42:35', 'parenttype': 'DocType', 'fieldname': 'delivery_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-08-04 09:42:35', 'doctype': 'DocField', 'oldfieldname': 'confirmation_date', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'jai@webnotestech.com', 'label': 'Confirmation Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Update Delivery Date Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05813', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-08-04 09:42:35', 'parenttype': 'DocType', 'fieldname': 'confirmation_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Update Delivery Date Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:29',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'jai@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Production',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 1
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Update Delivery Date Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Update Delivery Date Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Update Delivery Date Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sales_order_no',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Sales Order No',
+		'oldfieldname': 'sales_order_no',
+		'oldfieldtype': 'Link',
+		'options': 'Sales Order',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Customer',
+		'oldfieldname': 'customer',
+		'oldfieldtype': 'Data',
+		'options': 'Customer',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'city',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'City',
+		'oldfieldname': 'city',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'state',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'label': 'State',
+		'oldfieldname': 'state',
+		'oldfieldtype': 'Link',
+		'options': 'State',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'territory',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'label': 'Territory',
+		'oldfieldname': 'territory',
+		'oldfieldtype': 'Link',
+		'options': 'Territory',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rounded_total',
+		'fieldtype': 'Data',
+		'idx': 6,
+		'label': 'Total Amount',
+		'oldfieldname': 'rounded_total',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'delivery_date',
+		'fieldtype': 'Date',
+		'idx': 7,
+		'label': 'Expected Delivery Date',
+		'oldfieldname': 'delivery_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'confirmation_date',
+		'fieldtype': 'Date',
+		'idx': 8,
+		'label': 'Confirmation Date',
+		'oldfieldname': 'confirmation_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/production/doctype/workstation/workstation.txt b/production/doctype/workstation/workstation.txt
index 2dba6e8ee5..bb7cc21811 100644
--- a/production/doctype/workstation/workstation.txt
+++ b/production/doctype/workstation/workstation.txt
@@ -1 +1,284 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-08-31 15:18:01', 'search_fields': None, 'module': 'Production', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 13, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:workstation_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Workstation', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00398', 'parent': 'Workstation', 'read': 1, 'create': 1, 'creation': '2009-08-31 15:18:01', 'modified': '2010-09-20 11:10:42', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00399', 'parent': 'Workstation', 'read': 1, 'create': None, 'creation': '2009-08-31 15:18:01', 'modified': '2010-09-20 11:10:42', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01006', 'parent': 'Workstation', 'read': 1, 'create': 1, 'creation': '2010-05-20 11:39:35', 'modified': '2010-09-20 11:10:42', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'Production User', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01007', 'parent': 'Workstation', 'read': 1, 'create': 1, 'creation': '2010-05-20 11:39:35', 'modified': '2010-09-20 11:10:42', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 4, 'parenttype': 'DocType', 'role': 'Production User', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01008', 'parent': 'Workstation', 'read': 1, 'create': None, 'creation': '2010-05-20 11:39:35', 'modified': '2010-09-20 11:10:42', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 5, 'parenttype': 'DocType', 'role': 'Production Manager', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01009', 'parent': 'Workstation', 'read': 1, 'create': None, 'creation': '2010-05-20 11:39:35', 'modified': '2010-09-20 11:10:42', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 6, 'parenttype': 'DocType', 'role': 'Production User', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Workstation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04869', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 11:10:42', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-08-31 15:18:01', 'doctype': 'DocField', 'oldfieldname': 'workstation_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Workstation Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Workstation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02895', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 11:10:42', 'parenttype': 'DocType', 'fieldname': 'workstation_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-08-31 15:18:01', 'doctype': 'DocField', 'oldfieldname': 'warehouse', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Warehouse', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Workstation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02896', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-20 11:10:42', 'parenttype': 'DocType', 'fieldname': 'warehouse', 'fieldtype': 'Link', 'options': 'Warehouse', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-08-31 15:18:01', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Workstation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02897', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-09-20 11:10:42', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-08-31 15:18:01', 'doctype': 'DocField', 'oldfieldname': 'capacity', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Capacity', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Workstation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02898', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-09-20 11:10:42', 'parenttype': 'DocType', 'fieldname': 'capacity', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-08-31 15:18:01', 'doctype': 'DocField', 'oldfieldname': 'capacity_units', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Capacity Units', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Workstation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02899', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-09-20 11:10:42', 'parenttype': 'DocType', 'fieldname': 'capacity_units', 'fieldtype': 'Select', 'options': '\nUnits/Shifts\nUnits/Hour', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:18:01', 'doctype': 'DocField', 'oldfieldname': 'hour_rate_labour', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Hour Rate Labour', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Workstation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02900', 'idx': 7, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-20 11:10:42', 'parenttype': 'DocType', 'fieldname': 'hour_rate_labour', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2009-08-31 15:18:01', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Over Heads', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Workstation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02901', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-09-20 11:10:42', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:18:01', 'doctype': 'DocField', 'oldfieldname': 'hour_rate_electricity', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Hour Rate Electricity', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Workstation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02902', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-09-20 11:10:42', 'parenttype': 'DocType', 'fieldname': 'hour_rate_electricity', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:18:01', 'doctype': 'DocField', 'oldfieldname': 'hour_rate_consumable', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Hour Rate Consumable', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Workstation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02903', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-09-20 11:10:42', 'parenttype': 'DocType', 'fieldname': 'hour_rate_consumable', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:18:01', 'doctype': 'DocField', 'oldfieldname': 'hour_rate_rent', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Hour Rate Rent', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Workstation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02904', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-09-20 11:10:42', 'parenttype': 'DocType', 'fieldname': 'hour_rate_rent', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:18:01', 'doctype': 'DocField', 'oldfieldname': 'overhead', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Overhead', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Workstation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02905', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-09-20 11:10:42', 'parenttype': 'DocType', 'fieldname': 'overhead', 'fieldtype': 'Currency', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-08-31 15:18:01', 'doctype': 'DocField', 'oldfieldname': 'hour_rate', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Hour Rate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Workstation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02907', 'idx': 13, 'default': None, 'colour': None, 'modified': '2010-09-20 11:10:42', 'parenttype': 'DocType', 'fieldname': 'hour_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Workstation
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:31',
+		'docstatus': 0,
+		'modified': '2011-01-04 13:40:42',
+		'modified_by': 'rahul@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:workstation_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Production',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 11
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Workstation',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Workstation',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Workstation
+	{
+		'doctype': 'DocType',
+		'name': 'Workstation'
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'Production User',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Production User',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 1,
+		'role': 'Production Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'Production User'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'workstation_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Workstation Name',
+		'oldfieldname': 'workstation_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'warehouse',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'label': 'Warehouse',
+		'oldfieldname': 'warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 4,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'capacity',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 5,
+		'label': 'Capacity',
+		'oldfieldname': 'capacity',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'capacity_units',
+		'fieldtype': 'Select',
+		'hidden': 1,
+		'idx': 6,
+		'label': 'Capacity Units',
+		'oldfieldname': 'capacity_units',
+		'oldfieldtype': 'Select',
+		'options': '\nUnits/Shifts\nUnits/Hour',
+		'permlevel': 0,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'hour_rate_labour',
+		'fieldtype': 'Currency',
+		'idx': 7,
+		'label': 'Hour Rate Labour',
+		'oldfieldname': 'hour_rate_labour',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 8,
+		'label': 'Over Heads',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'hour_rate_electricity',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'label': 'Hour Rate Electricity',
+		'oldfieldname': 'hour_rate_electricity',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'hour_rate_consumable',
+		'fieldtype': 'Currency',
+		'idx': 10,
+		'label': 'Hour Rate Consumable',
+		'oldfieldname': 'hour_rate_consumable',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'hour_rate_rent',
+		'fieldtype': 'Currency',
+		'idx': 11,
+		'label': 'Hour Rate Rent',
+		'oldfieldname': 'hour_rate_rent',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'overhead',
+		'fieldtype': 'Currency',
+		'idx': 12,
+		'label': 'Overhead',
+		'oldfieldname': 'overhead',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 13,
+		'label': 'Hour Rate',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'hour_rate',
+		'fieldtype': 'Currency',
+		'idx': 14,
+		'label': 'Hour Rate',
+		'oldfieldname': 'hour_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/production/page/bill_of_materials/bill_of_materials.txt b/production/page/bill_of_materials/bill_of_materials.txt
index ce3232d4e7..b66f706262 100644
--- a/production/page/bill_of_materials/bill_of_materials.txt
+++ b/production/page/bill_of_materials/bill_of_materials.txt
@@ -1 +1,58 @@
-[{'creation': '2009-08-31 15:26:19', 'module': 'Production', 'doctype': 'Page', 'owner': 'Administrator', 'style': None, 'modified_by': 'Administrator', 'script': None, 'show_in_menu': 1, 'content': None, 'page_name': 'Bill of Materials', 'menu_index': None, 'docstatus': 0, 'parent': None, 'standard': 'Yes', 'icon': '', 'name': 'Bill of Materials', 'idx': None, 'static_content': None, 'modified': '2010-09-25 00:00:00', 'parenttype': None, 'parent_node': None, 'parentfield': None}, {'modified_by': 'Administrator', 'name': 'PR000040', 'parent': 'Bill of Materials', 'creation': '2009-08-31 15:26:19', 'modified': '2010-05-10 09:41:53', 'doctype': 'Page Role', 'idx': 1, 'parenttype': 'Page', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': 'roles'}, {'modified_by': 'Administrator', 'name': 'PR000111', 'parent': 'Bill of Materials', 'creation': '2010-03-15 13:25:15', 'modified': '2010-05-10 09:41:53', 'doctype': 'Page Role', 'idx': 2, 'parenttype': 'Page', 'role': 'Production User', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'parentfield': 'roles'}, {'modified_by': 'Administrator', 'name': 'PR000112', 'parent': 'Bill of Materials', 'creation': '2010-03-15 13:25:15', 'modified': '2010-05-10 09:41:53', 'doctype': 'Page Role', 'idx': 3, 'parenttype': 'Page', 'role': 'Production Manager', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'parentfield': 'roles'}]
\ No newline at end of file
+# Page, Bill of Materials
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-10-12 15:19:31',
+		'docstatus': 0,
+		'modified': '2010-12-23 12:58:19',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
+		'module': 'Production',
+		'name': '__common__',
+		'page_name': 'Bill of Materials',
+		'show_in_menu': 1,
+		'standard': 'Yes'
+	},
+
+	# These values are common for all Page Role
+	{
+		'doctype': 'Page Role',
+		'name': '__common__',
+		'parent': 'Bill of Materials',
+		'parentfield': 'roles',
+		'parenttype': 'Page'
+	},
+
+	# Page, Bill of Materials
+	{
+		'doctype': 'Page',
+		'name': 'Bill of Materials'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 1,
+		'role': 'Administrator'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 2,
+		'role': 'Production User'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 3,
+		'role': 'Production Manager'
+	}
+]
\ No newline at end of file
diff --git a/roles/Role/Projects User/Projects User.txt b/projects/Role/Projects User/Projects User.txt
similarity index 100%
rename from roles/Role/Projects User/Projects User.txt
rename to projects/Role/Projects User/Projects User.txt
diff --git a/projects/doctype/activity_type/activity_type.txt b/projects/doctype/activity_type/activity_type.txt
index 22abb5b48f..f3661017a8 100644
--- a/projects/doctype/activity_type/activity_type.txt
+++ b/projects/doctype/activity_type/activity_type.txt
@@ -1,136 +1,78 @@
+# DocType, Activity Type
 [
+
+	# These values are common in all dictionaries
 	{
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'field:activity_type',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-21 15:43:40',
-		'description': None,
+		'creation': '2011-02-23 11:22:28',
 		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': 1,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
 		'modified': '2011-02-21 15:43:40',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'field:activity_type',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_dialog': 1,
 		'module': 'Projects',
-		'name': 'Activity Type',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
+		'name': '__common__',
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
-		'show_in_menu': None,
-		'smallicon': None,
-		'use_template': None,
 		'version': 12
 	},
+
+	# These values are common for all DocField
 	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2011-02-21 15:43:40',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-02-21 15:43:40',
-		'modified_by': 'Administrator',
-		'name': 'PERM00739',
-		'owner': 'Administrator',
-		'parent': 'Activity Type',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2011-02-21 15:43:40',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-02-21 15:43:40',
-		'modified_by': 'Administrator',
-		'name': 'PERM00740',
-		'owner': 'Administrator',
-		'parent': 'Activity Type',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Projects User',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-21 15:43:40',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'activity_type',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 1,
-		'in_filter': None,
 		'label': 'Activity Type',
-		'modified': '2011-02-21 15:43:40',
-		'modified_by': 'Administrator',
-		'name': 'FL04231',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
+		'name': '__common__',
 		'parent': 'Activity Type',
 		'parentfield': 'fields',
 		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Activity Type',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'write': 1
+	},
+
+	# DocType, Activity Type
+	{
+		'doctype': 'DocType',
+		'name': 'Activity Type'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'Projects User'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField'
 	}
 ]
\ No newline at end of file
diff --git a/projects/doctype/project/project.txt b/projects/doctype/project/project.txt
index 70c49479b5..b144246889 100644
--- a/projects/doctype/project/project.txt
+++ b/projects/doctype/project/project.txt
@@ -1,1220 +1,482 @@
+# DocType, Project
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': '1300962301',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
+		'creation': '2010-08-08 17:09:14',
+		'docstatus': 0,
+		'modified': '2011-01-05 15:24:43',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1305714062',
 		'allow_trash': 1,
 		'autoname': 'field:project_name',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:14',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocType',
 		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2010-11-26 12:28:34',
-		'modified_by': 'Administrator',
 		'module': 'Projects',
-		'name': 'Project',
-		'name_case': '',
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': '',
-		'read_only': None,
-		'read_only_onload': None,
+		'name': '__common__',
 		'search_fields': 'customer, status, priority, is_active',
 		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
-		'show_in_menu': None,
-		'smallicon': None,
 		'subject': ' ',
 		'tag_fields': 'status',
-		'use_template': None,
 		'version': 32
 	},
+
+	# These values are common for all DocField
 	{
-		'amend': None,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:14',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2010-08-08 17:09:14',
-		'modified_by': 'Administrator',
-		'name': 'PERM00408',
-		'owner': 'Administrator',
-		'parent': 'Project',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'All',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:14',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2010-08-08 17:09:14',
-		'modified_by': 'Administrator',
-		'name': 'PERM00409',
-		'owner': 'Administrator',
-		'parent': 'Project',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Projects User',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:14',
-		'default': None,
-		'depends_on': None,
-		'description': 'Helps you keep track of your projects and links to Tasks. You can tag a task to a project to track its progress',
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Basic Info',
-		'modified': '2010-08-08 17:09:14',
-		'modified_by': 'Administrator',
-		'name': 'FL02344',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
+		'name': '__common__',
 		'parent': 'Project',
 		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Project',
+		'parentfield': 'permissions',
 		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': '',
-		'width': None
+		'read': 1,
+		'write': 1
 	},
+
+	# DocType, Project
+	{
+		'doctype': 'DocType',
+		'name': 'Project'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'All'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'Projects User'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Helps you keep track of your projects and links to Tasks. You can tag a task to a project to track its progress',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Basic Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:14',
-		'default': None,
-		'depends_on': None,
 		'description': 'Project will get saved and will be searchable with project name given',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'project_name',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
-		'in_filter': None,
 		'label': 'Project Name',
-		'modified': '2010-08-08 17:09:14',
-		'modified_by': 'Administrator',
-		'name': 'FL02345',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'project_name',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:47:55',
 		'default': 'Open',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'status',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
 		'in_filter': 1,
 		'label': 'Status',
-		'modified': '2010-09-01 15:47:55',
-		'modified_by': 'Administrator',
-		'name': 'FL03822',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'status',
 		'oldfieldtype': 'Select',
 		'options': 'Open\nCompleted\nCancelled',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': '',
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:14',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'is_active',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 4,
-		'in_filter': None,
 		'label': 'Is Active',
-		'modified': '2010-08-08 17:09:14',
-		'modified_by': 'Administrator',
-		'name': 'FL02348',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'is_active',
 		'oldfieldtype': 'Select',
 		'options': 'Yes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:14',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'priority',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 5,
-		'in_filter': None,
 		'label': 'Priority',
-		'modified': '2010-08-08 17:09:14',
-		'modified_by': 'Administrator',
-		'name': 'FL02346',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'priority',
 		'oldfieldtype': 'Select',
 		'options': 'Medium\nLow\nHigh',
-		'owner': 'Administrator',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'project_value',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 6,
-		'in_filter': None,
 		'label': 'Project Value',
-		'modified': '2010-12-14 10:33:01',
-		'modified_by': 'Administrator',
-		'name': 'FL04170',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'project_value',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '150px'
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'gross_margin_value',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 7,
-		'in_filter': None,
 		'label': 'Gross Margin Value',
-		'modified': '2010-12-14 10:33:01',
-		'modified_by': 'Administrator',
-		'name': 'FL04171',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'gross_margin_value',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'per_gross_margin',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 8,
-		'in_filter': None,
 		'label': 'Gross Margin %',
-		'modified': '2010-12-14 10:33:01',
-		'modified_by': 'Administrator',
-		'name': 'FL04172',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'per_gross_margin',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'est_material_cost',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 9,
-		'in_filter': None,
 		'label': 'Estimated Material Cost',
-		'modified': '2010-12-14 10:33:01',
-		'modified_by': 'Administrator',
-		'name': 'FL04173',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'est_material_cost',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '150px'
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:47:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'project_type',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 10,
-		'in_filter': None,
 		'label': 'Project Type',
-		'modified': '2010-09-01 15:47:55',
-		'modified_by': 'Administrator',
-		'name': 'FL03823',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'project_type',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:47:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'project_start_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 11,
 		'in_filter': 1,
 		'label': 'Project Start Date',
-		'modified': '2010-09-01 15:47:55',
-		'modified_by': 'Administrator',
-		'name': 'FL03824',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'project_start_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:14',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'completion_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 12,
-		'in_filter': None,
 		'label': 'Completion Date',
-		'modified': '2010-08-08 17:09:14',
-		'modified_by': 'Administrator',
-		'name': 'FL02347',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'completion_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'act_completion_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 13,
-		'in_filter': None,
 		'label': 'Actual Completion Date',
-		'modified': '2010-12-14 10:33:01',
-		'modified_by': 'Administrator',
-		'name': 'FL04169',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'act_completion_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:47:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'amended_from',
 		'fieldtype': 'Data',
 		'hidden': 1,
-		'icon': None,
 		'idx': 14,
-		'in_filter': None,
 		'label': 'Amended From',
-		'modified': '2010-09-01 15:47:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03825',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'amended_from',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:47:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'amemdment_date',
 		'fieldtype': 'Date',
 		'hidden': 1,
-		'icon': None,
 		'idx': 15,
-		'in_filter': None,
 		'label': 'Amemdment Date',
-		'modified': '2010-09-01 15:47:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03826',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'amemdment_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:47:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 16,
-		'in_filter': None,
 		'label': 'Project Details',
-		'modified': '2010-09-01 15:47:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03827',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
 		'options': 'Simple',
-		'owner': 'Administrator',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:14',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 17,
-		'in_filter': None,
-		'label': '',
-		'modified': '2010-08-08 17:09:14',
-		'modified_by': 'Administrator',
-		'name': 'FL02349',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:14',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 18,
-		'in_filter': None,
-		'label': '',
-		'modified': '2010-08-08 17:09:14',
-		'modified_by': 'Administrator',
-		'name': 'FL02350',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
 		'options': 'Simple',
-		'owner': 'Administrator',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:14',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'notes',
 		'fieldtype': 'Text Editor',
-		'hidden': None,
-		'icon': None,
 		'idx': 19,
-		'in_filter': None,
 		'label': 'Notes',
-		'modified': '2010-08-08 17:09:14',
-		'modified_by': 'Administrator',
-		'name': 'FL02351',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'notes',
 		'oldfieldtype': 'Text Editor',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:47:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 20,
-		'in_filter': None,
 		'label': 'Customer Details',
-		'modified': '2010-09-01 15:47:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03828',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': ''
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:47:56',
-		'default': None,
-		'depends_on': None,
 		'description': 'Select name of Customer to whom project belongs',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'customer',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 21,
 		'in_filter': 1,
 		'label': 'Customer',
-		'modified': '2010-09-01 15:47:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03829',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'customer',
 		'oldfieldtype': 'Link',
 		'options': 'Customer',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
 		'reqd': 0,
 		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:47:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'customer_name',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 22,
 		'in_filter': 1,
 		'label': 'Customer Name',
-		'modified': '2010-09-01 15:47:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03830',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'customer_name',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:47:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'customer_address',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 23,
-		'in_filter': None,
 		'label': 'Customer Address',
-		'modified': '2010-09-01 15:47:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03831',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'customer_address',
 		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:47:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'contact_person',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 24,
 		'in_filter': 1,
 		'label': 'Contact Person',
-		'modified': '2010-09-01 15:47:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03832',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'contact_person',
 		'oldfieldtype': 'Link',
-		'options': '',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 0,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:47:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'territory',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 25,
 		'in_filter': 1,
 		'label': 'Territory',
-		'modified': '2010-09-01 15:47:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03833',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'territory',
 		'oldfieldtype': 'Link',
 		'options': 'Territory',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 0,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:47:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'contact_no',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 26,
-		'in_filter': None,
 		'label': 'Contact No',
-		'modified': '2010-09-01 15:47:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03834',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'contact_no',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:47:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'email_id',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 27,
-		'in_filter': None,
 		'label': 'Email Id',
-		'modified': '2010-09-01 15:47:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03835',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'email_id',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:47:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'customer_group',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 28,
-		'in_filter': None,
 		'label': 'Customer Group',
-		'modified': '2010-09-01 15:47:56',
-		'modified_by': 'Administrator',
-		'name': 'FL03836',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'customer_group',
 		'oldfieldtype': 'Link',
 		'options': 'Customer Group',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:14',
-		'default': None,
-		'depends_on': None,
 		'description': 'Important dates and commitments in your project life cycle',
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 29,
-		'in_filter': None,
 		'label': 'Milestones',
-		'modified': '2010-08-08 17:09:14',
-		'modified_by': 'Administrator',
-		'name': 'FL02352',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': '',
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:14',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'project_milestones',
 		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
 		'idx': 30,
-		'in_filter': None,
 		'label': 'Project Milestones',
-		'modified': '2010-08-08 17:09:14',
-		'modified_by': 'Administrator',
-		'name': 'FL02353',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'project_milestones',
 		'oldfieldtype': 'Table',
 		'options': 'Project Milestone',
-		'owner': 'Administrator',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'trash_reason',
 		'fieldtype': 'Small Text',
 		'hidden': 1,
-		'icon': None,
 		'idx': 31,
-		'in_filter': None,
 		'label': 'Trash Reason',
-		'modified': '2010-12-14 10:33:01',
-		'modified_by': 'Administrator',
-		'name': 'FL04174',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'trash_reason',
 		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Project',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	}
 ]
\ No newline at end of file
diff --git a/projects/doctype/project_activity/project_activity.txt b/projects/doctype/project_activity/project_activity.txt
index 38c013986b..d194131ea0 100644
--- a/projects/doctype/project_activity/project_activity.txt
+++ b/projects/doctype/project_activity/project_activity.txt
@@ -1 +1,175 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-20 13:29:32', 'search_fields': None, 'module': 'Projects', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 15, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'Activity.######', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': None, 'name': 'Project Activity', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00846', 'parent': 'Project Activity', 'read': 1, 'create': 1, 'creation': '2010-04-20 13:29:32', 'modified': '2010-04-20 15:22:20', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'All', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-04-20 13:52:55', 'doctype': 'DocField', 'oldfieldname': 'project', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Project', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Project Activity', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04821', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-04-20 15:22:20', 'parenttype': 'DocType', 'fieldname': 'project', 'fieldtype': 'Link', 'options': 'Project', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-20 13:29:32', 'doctype': 'DocField', 'oldfieldname': 'activity_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Activity Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Project Activity', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04814', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-04-20 15:22:20', 'parenttype': 'DocType', 'fieldname': 'activity_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-20 13:29:32', 'doctype': 'DocField', 'oldfieldname': 'percent_complete', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Percent Complete', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Project Activity', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04815', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-04-20 15:22:21', 'parenttype': 'DocType', 'fieldname': 'percent_complete', 'fieldtype': 'Select', 'options': '0\n5\n10\n15\n20\n25\n30\n35\n40\n45\n50\n55\n60\n65\n70\n75\n80\n85\n90\n95\n100', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-04-20 13:39:48', 'doctype': 'DocField', 'oldfieldname': 'last_update', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Last Update', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Project Activity', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04819', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-04-20 15:22:21', 'parenttype': 'DocType', 'fieldname': 'last_update', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-20 13:39:48', 'doctype': 'DocField', 'oldfieldname': 'last_update_by', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Last Update By', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Project Activity', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04820', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-04-20 15:22:21', 'parenttype': 'DocType', 'fieldname': 'last_update_by', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-04-20 15:16:55', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Updates', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Project Activity', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04875', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-04-20 15:22:21', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'HTML', 'creation': '2010-04-20 13:29:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Updates HTML', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Project Activity', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04816', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-04-20 15:22:21', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2010-04-20 15:05:24', 'doctype': 'DocField', 'oldfieldname': 'new_update', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'New Update', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Project Activity', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04872', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-04-20 15:22:21', 'parenttype': 'DocType', 'fieldname': 'new_update', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Float', 'creation': '2010-04-20 15:05:24', 'doctype': 'DocField', 'oldfieldname': 'hours', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Hours', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Project Activity', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04873', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-04-20 15:22:21', 'parenttype': 'DocType', 'fieldname': 'hours', 'fieldtype': 'Float', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2010-04-20 15:05:24', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Add', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Project Activity', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04874', 'idx': 10, 'default': None, 'colour': 'White:FFF', 'modified': '2010-04-20 15:22:21', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Project Activity
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:14',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'Activity.######',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'Projects',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 15
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Project Activity',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'Project Activity',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'All',
+		'write': 1
+	},
+
+	# DocType, Project Activity
+	{
+		'doctype': 'DocType',
+		'name': 'Project Activity'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'project',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Project',
+		'oldfieldname': 'project',
+		'oldfieldtype': 'Link',
+		'options': 'Project'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'activity_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Activity Name',
+		'oldfieldname': 'activity_name',
+		'oldfieldtype': 'Data',
+		'print_hide': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'percent_complete',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Percent Complete',
+		'oldfieldname': 'percent_complete',
+		'oldfieldtype': 'Select',
+		'options': '0\n5\n10\n15\n20\n25\n30\n35\n40\n45\n50\n55\n60\n65\n70\n75\n80\n85\n90\n95\n100',
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'last_update',
+		'fieldtype': 'Date',
+		'hidden': 1,
+		'idx': 4,
+		'label': 'Last Update',
+		'oldfieldname': 'last_update',
+		'oldfieldtype': 'Date',
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'last_update_by',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 5,
+		'label': 'Last Update By',
+		'oldfieldname': 'last_update_by',
+		'oldfieldtype': 'Data',
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 6,
+		'label': 'Updates',
+		'oldfieldtype': 'Section Break'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 7,
+		'label': 'Updates HTML',
+		'oldfieldtype': 'HTML'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'new_update',
+		'fieldtype': 'Text',
+		'idx': 8,
+		'label': 'New Update',
+		'oldfieldname': 'new_update',
+		'oldfieldtype': 'Text'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'hours',
+		'fieldtype': 'Float',
+		'idx': 9,
+		'label': 'Hours',
+		'oldfieldname': 'hours',
+		'oldfieldtype': 'Float'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 10,
+		'label': 'Add',
+		'oldfieldtype': 'Button',
+		'trigger': 'Client'
+	}
+]
\ No newline at end of file
diff --git a/projects/doctype/project_activity_update/project_activity_update.txt b/projects/doctype/project_activity_update/project_activity_update.txt
index 9b11c67ecb..5455de5638 100644
--- a/projects/doctype/project_activity_update/project_activity_update.txt
+++ b/projects/doctype/project_activity_update/project_activity_update.txt
@@ -1 +1,63 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-20 13:32:19', 'search_fields': None, 'module': 'Projects', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 1, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Project Activity Update', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2010-04-20 13:32:19', 'doctype': 'DocField', 'oldfieldname': 'update', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Update', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Project Activity Update', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04817', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-04-20 13:32:19', 'parenttype': 'DocType', 'fieldname': 'update', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Float', 'creation': '2010-04-20 13:32:19', 'doctype': 'DocField', 'oldfieldname': 'hours', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Hours', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'e.g. 0.5, 2.5 etc', 'parent': 'Project Activity Update', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04818', 'idx': 2, 'default': None, 'colour': 'White:FFF', 'modified': '2010-04-20 13:32:19', 'parenttype': 'DocType', 'fieldname': 'hours', 'fieldtype': 'Float', 'options': '', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Project Activity Update
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:15',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Projects',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'version': 1
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Project Activity Update',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Project Activity Update
+	{
+		'doctype': 'DocType',
+		'name': 'Project Activity Update'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'update',
+		'fieldtype': 'Text',
+		'idx': 1,
+		'label': 'Update',
+		'oldfieldname': 'update',
+		'oldfieldtype': 'Text'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'e.g. 0.5, 2.5 etc',
+		'doctype': 'DocField',
+		'fieldname': 'hours',
+		'fieldtype': 'Float',
+		'idx': 2,
+		'label': 'Hours',
+		'oldfieldname': 'hours',
+		'oldfieldtype': 'Float'
+	}
+]
\ No newline at end of file
diff --git a/projects/doctype/project_control/project_control.txt b/projects/doctype/project_control/project_control.txt
index e1719125a6..9e1422de85 100644
--- a/projects/doctype/project_control/project_control.txt
+++ b/projects/doctype/project_control/project_control.txt
@@ -1 +1,30 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-20 15:42:00', 'search_fields': None, 'module': 'Projects', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'harshada@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 43, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': '', 'name': 'Project Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-11-02 10:10:37', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
+# DocType, Project Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:15',
+		'docstatus': 0,
+		'modified': '2010-12-23 10:43:22',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Projects',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 30
+	},
+
+	# DocType, Project Control
+	{
+		'doctype': 'DocType',
+		'name': 'Project Control'
+	}
+]
\ No newline at end of file
diff --git a/projects/doctype/project_milestone/project_milestone.txt b/projects/doctype/project_milestone/project_milestone.txt
index c098400313..eab533b4f1 100644
--- a/projects/doctype/project_milestone/project_milestone.txt
+++ b/projects/doctype/project_milestone/project_milestone.txt
@@ -1 +1,84 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-20 13:27:02', 'search_fields': None, 'module': 'Projects', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 1, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Project Milestone', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-04-20 13:27:02', 'doctype': 'DocField', 'oldfieldname': 'milestone_date', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Milestone Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Project Milestone', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04807', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-04-20 13:27:02', 'parenttype': 'DocType', 'fieldname': 'milestone_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2010-04-20 13:27:02', 'doctype': 'DocField', 'oldfieldname': 'milestone', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Milestone', 'width': '300px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Project Milestone', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04808', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-04-20 13:27:02', 'parenttype': 'DocType', 'fieldname': 'milestone', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-20 13:27:02', 'doctype': 'DocField', 'oldfieldname': 'status', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Status', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Project Milestone', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04809', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-04-20 13:27:02', 'parenttype': 'DocType', 'fieldname': 'status', 'fieldtype': 'Select', 'options': 'Pending\nCompleted', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Project Milestone
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:15',
+		'docstatus': 0,
+		'modified': '2011-01-05 15:24:43',
+		'modified_by': 'sneha@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Projects',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 2
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Project Milestone',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Project Milestone
+	{
+		'doctype': 'DocType',
+		'name': 'Project Milestone'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'milestone_date',
+		'fieldtype': 'Date',
+		'idx': 1,
+		'label': 'Milestone Date',
+		'oldfieldname': 'milestone_date',
+		'oldfieldtype': 'Date'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'actual_completion_date_',
+		'fieldtype': 'Date',
+		'idx': 2,
+		'label': 'Actual Completion Date '
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'milestone',
+		'fieldtype': 'Text',
+		'idx': 3,
+		'label': 'Milestone',
+		'oldfieldname': 'milestone',
+		'oldfieldtype': 'Text',
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'label': 'Status',
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Select',
+		'options': 'Pending\nCompleted'
+	}
+]
\ No newline at end of file
diff --git a/projects/doctype/ticket/ticket.txt b/projects/doctype/ticket/ticket.txt
index adb49b3b4b..e9d5ff0283 100644
--- a/projects/doctype/ticket/ticket.txt
+++ b/projects/doctype/ticket/ticket.txt
@@ -1,1590 +1,575 @@
+# DocType, Ticket
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': '1301381320',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
+		'creation': '2011-01-28 17:52:35',
+		'docstatus': 0,
+		'modified': '2010-12-03 10:04:58',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1307707462',
 		'allow_trash': 1,
 		'autoname': 'TIC/.####',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:28',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocType',
 		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-03-29 12:18:37',
-		'modified_by': 'Administrator',
 		'module': 'Projects',
-		'name': 'Ticket',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
+		'name': '__common__',
+		'section_style': 'Tray',
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
 		'subject': '%(subject)s',
 		'tag_fields': 'status',
-		'use_template': None,
-		'version': 146
+		'version': 245
 	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Ticket',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Ticket',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Ticket
+	{
+		'doctype': 'DocType',
+		'name': 'Ticket'
+	},
+
+	# DocPerm
 	{
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2010-08-08 17:09:28',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 1,
-		'match': None,
-		'modified': '2011-03-29 12:18:37',
-		'modified_by': 'Administrator',
-		'name': 'PERM00615',
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'read': 1,
 		'role': 'All',
-		'submit': None,
 		'write': 1
 	},
+
+	# DocPerm
 	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:28',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 2,
-		'match': None,
-		'modified': '2011-03-29 12:18:37',
-		'modified_by': 'Administrator',
-		'name': 'PERM00616',
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'read': 1,
 		'role': 'All',
-		'submit': None,
 		'write': 0
 	},
+
+	# DocPerm
 	{
-		'amend': None,
+		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2010-08-08 17:09:28',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 3,
-		'match': None,
-		'modified': '2011-03-29 12:18:37',
-		'modified_by': 'Administrator',
-		'name': 'PERM00617',
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'read': 1,
 		'role': 'Projects User',
-		'submit': None,
 		'write': 1
 	},
+
+	# DocPerm
 	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:28',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 4,
-		'match': None,
-		'modified': '2011-03-29 12:18:37',
-		'modified_by': 'Administrator',
-		'name': 'PERM00618',
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'read': 1,
-		'role': 'Projects User',
-		'submit': None,
-		'write': None
+		'role': 'Projects User'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:28',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 1,
-		'in_filter': None,
 		'label': 'Task Details',
-		'modified': '2011-03-29 12:18:37',
-		'modified_by': 'Administrator',
-		'name': 'FL03607',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
 		'search_index': 0,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:29',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'subject',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
 		'in_filter': 1,
 		'label': 'Subject',
-		'modified': '2011-03-29 12:18:37',
-		'modified_by': 'Administrator',
-		'name': 'FL03608',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'subject',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:29',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'status',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
-		'in_filter': None,
 		'label': 'Status',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL03610',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'status',
 		'oldfieldtype': 'Select',
 		'options': 'Open\nPending Review\nClosed\nCancelled',
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'reason',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Reason / Error Message',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04215',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'reason',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'document_num',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Document Num',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04216',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'document_num',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:06',
-		'default': '_Login',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'ticket_by',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Ticket By',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04217',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'ticket_by',
-		'oldfieldtype': 'Link',
-		'options': 'Profile',
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'ticket_by_email',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Ticket By Email',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04218',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'ticket_by_email',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:29',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'opening_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Opening Date',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL03611',
-		'no_column': None,
-		'no_copy': None,
+		'idx': 4,
+		'label': 'Creation Date',
 		'oldfieldname': 'opening_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:29',
-		'default': None,
+		'colour': 'White:FFF',
 		'depends_on': 'eval:doc.status == "Closed" || doc.status == "Pending Review"',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'review_date',
 		'fieldtype': 'Date',
 		'hidden': 1,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
+		'idx': 5,
 		'label': 'Review Date',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL03612',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'review_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:29',
-		'default': None,
+		'colour': 'White:FFF',
 		'depends_on': 'eval:doc.status == "Closed"',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'closing_date',
 		'fieldtype': 'Date',
 		'hidden': 1,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
+		'idx': 6,
 		'label': 'Closing Date',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL03613',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'closing_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:29',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'priority',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
+		'idx': 7,
 		'in_filter': 1,
 		'label': 'Priority',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL03616',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'priority',
 		'oldfieldtype': 'Select',
 		'options': 'Low\nMedium\nHigh\nUrgent',
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:29',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
+		'colour': 'White:FFF',
 		'doctype': 'DocField',
 		'fieldname': 'project',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
+		'idx': 8,
 		'label': 'Project',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL03623',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'project',
 		'oldfieldtype': 'Link',
 		'options': 'Project',
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-12-14 10:33:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'customer',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
+		'idx': 9,
 		'label': 'Customer',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04219',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'customer',
 		'oldfieldtype': 'Link',
 		'options': 'Customer',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'customer_name',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
+		'idx': 10,
 		'label': 'Customer Name',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04220',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'customer_name',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 17:56:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04418',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
+		'idx': 11,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:29',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
+		'colour': 'White:FFF',
 		'doctype': 'DocField',
 		'fieldname': 'allocated_to',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
+		'idx': 12,
 		'label': 'Allocated To',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL03626',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'allocated_to',
 		'oldfieldtype': 'Link',
 		'options': 'Profile',
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'allocated_to_name',
 		'fieldtype': 'Data',
 		'hidden': 1,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
+		'idx': 13,
 		'label': 'Allocated To Name',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04221',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'allocated_to_name',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:29',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'senders_name',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
+		'idx': 14,
 		'in_filter': 1,
 		'label': 'Raised By',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL03618',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'senders_name',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:29',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'senders_email',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
+		'idx': 15,
 		'label': 'Email',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL03619',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'senders_email',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:29',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'senders_contact_no',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
+		'idx': 16,
 		'label': 'Senders Contact No',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL03620',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'senders_contact_no',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:29',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'senders_company',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
+		'idx': 17,
 		'label': 'Senders Company',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL03621',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'senders_company',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:29',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'category',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
+		'idx': 18,
 		'label': 'Category',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL03614',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'category',
 		'oldfieldtype': 'Link',
 		'options': 'Ticket Category',
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:29',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'external_or_internal',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': None,
+		'idx': 19,
 		'label': 'External or Internal',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL03615',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'external_or_internal',
 		'oldfieldtype': 'Select',
 		'options': 'External\nInternal',
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'amended_from',
 		'fieldtype': 'Data',
 		'hidden': 1,
-		'icon': None,
-		'idx': 24,
-		'in_filter': None,
+		'idx': 20,
 		'label': 'Amended From',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04222',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'amended_from',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'report_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'amendment_date',
 		'fieldtype': 'Date',
 		'hidden': 1,
-		'icon': None,
-		'idx': 25,
-		'in_filter': None,
+		'idx': 21,
 		'label': 'Amendment Date',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04223',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'amendment_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
 		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'report_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:29',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 26,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL03628',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
+		'idx': 22,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'Simple',
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:29',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'description',
 		'fieldtype': 'Text Editor',
-		'hidden': None,
-		'icon': None,
-		'idx': 27,
-		'in_filter': None,
+		'idx': 23,
 		'label': 'Details',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL03629',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'description',
 		'oldfieldtype': 'Text Editor',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
 		'width': '300px'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:29',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'first_creation_flag',
 		'fieldtype': 'Int',
 		'hidden': 1,
-		'icon': None,
-		'idx': 28,
+		'idx': 24,
 		'in_filter': 0,
 		'label': 'First Creation Flag',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL03630',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'first_creation_flag',
 		'oldfieldtype': 'Int',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
+		'search_index': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:29',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'second_creation_flag',
 		'fieldtype': 'Int',
 		'hidden': 1,
-		'icon': None,
-		'idx': 29,
-		'in_filter': None,
+		'idx': 25,
 		'label': 'Second Creation Flag',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL03631',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'second_creation_flag',
 		'oldfieldtype': 'Int',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 30,
-		'in_filter': None,
+		'idx': 26,
 		'label': 'Time and Budget',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04224',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 31,
-		'in_filter': None,
+		'idx': 27,
 		'label': 'Expected',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04225',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'exp_start_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 32,
-		'in_filter': None,
+		'idx': 28,
 		'label': 'Expected Start Date',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04226',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'exp_start_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'exp_end_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 33,
+		'idx': 29,
 		'in_filter': 1,
 		'label': 'Expected End Date',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04227',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'exp_end_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'exp_total_hrs',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 34,
-		'in_filter': None,
+		'idx': 30,
 		'label': 'Total Hours (Expected)',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04228',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'exp_total_hrs',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'allocated_budget',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 35,
-		'in_filter': None,
+		'idx': 31,
 		'label': 'Allocated Budget',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04229',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'allocated_budget',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 36,
-		'in_filter': None,
+		'idx': 32,
 		'label': 'Actual',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04230',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'act_start_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 37,
-		'in_filter': None,
+		'idx': 33,
 		'label': 'Actual Start Date',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04231',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'act_start_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'act_end_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 38,
-		'in_filter': None,
+		'idx': 34,
 		'label': 'Actual End Date',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04232',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'act_end_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'act_total_hrs',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 39,
-		'in_filter': None,
+		'idx': 35,
 		'label': 'Total Hours (Actual)',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04233',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'act_total_hrs',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'actual_budget',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 40,
-		'in_filter': None,
+		'idx': 36,
 		'label': 'Actual Budget',
-		'modified': '2011-03-29 12:18:38',
-		'modified_by': 'Administrator',
-		'name': 'FL04234',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'actual_budget',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Ticket',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	}
 ]
\ No newline at end of file
diff --git a/projects/doctype/timesheet/timesheet.txt b/projects/doctype/timesheet/timesheet.txt
index 18dcf4f9f9..462b64bc28 100644
--- a/projects/doctype/timesheet/timesheet.txt
+++ b/projects/doctype/timesheet/timesheet.txt
@@ -1,510 +1,218 @@
+# DocType, Timesheet
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': '1300962490',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'TimeSheet.#####',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-12-14 10:33:07',
-		'description': None,
+		'creation': '2010-12-14 10:23:29',
 		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-03-05 17:16:43',
+		'modified': '2011-02-23 11:22:29',
 		'modified_by': 'Administrator',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'TimeSheet.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
 		'module': 'Projects',
-		'name': 'Timesheet',
-		'name_case': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
+		'name': '__common__',
 		'search_fields': 'status, owner, timesheet_date',
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
-		'show_in_menu': None,
-		'smallicon': None,
 		'subject': '%(owner)s',
-		'tag_fields': '',
-		'use_template': None,
 		'version': 68
 	},
+
+	# These values are common for all DocField
 	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-12-23 11:48:49',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': None,
-		'modified': '2010-12-23 11:48:49',
-		'modified_by': 'Administrator',
-		'name': 'PERM00769',
-		'owner': 'Administrator',
-		'parent': 'Timesheet',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Projects User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-12-23 11:48:49',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': None,
-		'match': None,
-		'modified': '2010-12-23 11:48:49',
-		'modified_by': 'Administrator',
-		'name': 'PERM00770',
-		'owner': 'Administrator',
-		'parent': 'Timesheet',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Projects User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-12-14 10:33:07',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2010-12-14 10:33:07',
-		'modified_by': 'Administrator',
-		'name': 'PERM00739',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Timesheet',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-12-14 10:33:07',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2010-12-14 10:33:07',
-		'modified_by': 'Administrator',
-		'name': 'PERM00740',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Timesheet',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-05 17:16:42',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Timesheet Details',
-		'modified': '2011-03-05 17:16:42',
-		'modified_by': 'Administrator',
-		'name': 'FL04673',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
+		'name': '__common__',
 		'parent': 'Timesheet',
 		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'parenttype': 'DocType'
 	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Timesheet',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Timesheet
+	{
+		'doctype': 'DocType',
+		'name': 'Timesheet'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'permlevel': 0,
+		'role': 'Projects User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'permlevel': 1,
+		'role': 'Projects User'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Timesheet Details',
+		'permlevel': 0
+	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-12-14 10:33:07',
 		'default': 'Draft',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'status',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
 		'in_filter': 0,
 		'label': 'Status',
-		'modified': '2010-12-14 10:33:07',
-		'modified_by': 'Administrator',
-		'name': 'FL04235',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'status',
 		'oldfieldtype': 'Select',
 		'options': '\nDraft\nSubmitted\nCancelled',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Timesheet',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': '',
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-12-14 10:33:07',
 		'default': 'Today',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'timesheet_date',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
 		'in_filter': 1,
 		'label': 'Timesheet Date',
-		'modified': '2010-12-14 10:33:07',
-		'modified_by': 'Administrator',
-		'name': 'FL04236',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'timesheet_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Timesheet',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': '',
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'owner',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 4,
 		'in_filter': 1,
 		'label': 'Timesheet By',
-		'modified': '2010-12-14 10:33:07',
-		'modified_by': 'Administrator',
-		'name': 'FL04237',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'owner',
 		'oldfieldtype': 'Link',
 		'options': 'Profile',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Timesheet',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'amended_from',
 		'fieldtype': 'Data',
 		'hidden': 1,
-		'icon': None,
 		'idx': 5,
-		'in_filter': None,
 		'label': 'Amended From',
-		'modified': '2010-12-14 10:33:07',
-		'modified_by': 'Administrator',
-		'name': 'FL04238',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'amended_from',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Timesheet',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'amendment_date',
 		'fieldtype': 'Date',
 		'hidden': 1,
-		'icon': None,
 		'idx': 6,
-		'in_filter': None,
 		'label': 'Amendment Date',
-		'modified': '2010-12-14 10:33:07',
-		'modified_by': 'Administrator',
-		'name': 'FL04239',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'amendment_date',
 		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Timesheet',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-05 17:16:42',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 7,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-03-05 17:16:42',
-		'modified_by': 'Administrator',
-		'name': 'FL04674',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Timesheet',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-05 17:16:42',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'notes',
 		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 8,
-		'in_filter': None,
 		'label': 'Notes',
-		'modified': '2011-03-05 17:16:42',
-		'modified_by': 'Administrator',
-		'name': 'FL04672',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Timesheet',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-05 17:16:42',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 9,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-03-05 17:16:42',
-		'modified_by': 'Administrator',
-		'name': 'FL04675',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'Simple',
-		'owner': 'Administrator',
-		'parent': 'Timesheet',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-14 10:33:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'timesheet_details',
 		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
 		'idx': 10,
-		'in_filter': None,
 		'label': 'Timesheet Details',
-		'modified': '2010-12-14 10:33:07',
-		'modified_by': 'Administrator',
-		'name': 'FL04240',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'timesheet_details',
 		'oldfieldtype': 'Table',
 		'options': 'Timesheet Detail',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Timesheet',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	}
 ]
\ No newline at end of file
diff --git a/projects/doctype/timesheet_detail/timesheet_detail.txt b/projects/doctype/timesheet_detail/timesheet_detail.txt
index 6d8dac5ad3..a96c14b9ff 100644
--- a/projects/doctype/timesheet_detail/timesheet_detail.txt
+++ b/projects/doctype/timesheet_detail/timesheet_detail.txt
@@ -1,370 +1,168 @@
+# DocType, Timesheet Detail
 [
+
+	# These values are common in all dictionaries
 	{
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'TSD.#####',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2011-02-26 11:39:45',
-		'description': None,
+		'creation': '2011-02-23 11:22:29',
 		'docstatus': 0,
+		'modified': '2011-02-23 11:22:28',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'TSD.#####',
+		'colour': 'White:FFF',
 		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-02-26 11:39:45',
-		'modified_by': 'Guest',
 		'module': 'Projects',
-		'name': 'Timesheet Detail',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
+		'name': '__common__',
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
-		'show_in_menu': None,
-		'smallicon': None,
-		'use_template': None,
 		'version': 15
 	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Timesheet Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Timesheet Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Timesheet Detail'
+	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-26 11:39:45',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'act_start_time',
 		'fieldtype': 'Time',
-		'hidden': None,
-		'icon': None,
 		'idx': 1,
-		'in_filter': None,
 		'label': 'Actual Start Time',
-		'modified': '2011-02-26 11:39:45',
-		'modified_by': 'Guest',
-		'name': 'FL04246',
-		'no_copy': None,
 		'oldfieldname': 'act_start_time',
 		'oldfieldtype': 'Time',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Timesheet Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
 		'width': '160px'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-26 11:39:45',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'act_end_time',
 		'fieldtype': 'Time',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
-		'in_filter': None,
 		'label': 'Actual End Time',
-		'modified': '2011-02-26 11:39:45',
-		'modified_by': 'Guest',
-		'name': 'FL04247',
-		'no_copy': None,
 		'oldfieldname': 'act_end_time',
 		'oldfieldtype': 'Time',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Timesheet Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
 		'width': '160px'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-26 11:39:45',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'activity_type',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
-		'in_filter': None,
 		'label': 'Activity Type',
-		'modified': '2011-02-26 11:39:45',
-		'modified_by': 'Guest',
-		'name': 'FL04248',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'Activity Type',
-		'owner': 'Administrator',
-		'parent': 'Timesheet Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
 		'width': '200px'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-26 11:39:45',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'other_details',
 		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 4,
-		'in_filter': None,
 		'label': 'Additional Info',
-		'modified': '2011-02-26 11:39:45',
-		'modified_by': 'Guest',
-		'name': 'FL04249',
-		'no_copy': None,
 		'oldfieldname': 'other_details',
 		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Timesheet Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '200px'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-26 11:39:45',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'act_total_hrs',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 5,
-		'in_filter': None,
 		'label': 'Total Hours (Actual)',
-		'modified': '2011-02-26 11:39:45',
-		'modified_by': 'Guest',
-		'name': 'FL04250',
-		'no_copy': None,
 		'oldfieldname': 'act_total_hrs',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Timesheet Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '100px'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-26 11:39:45',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'customer_name',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 6,
-		'in_filter': None,
 		'label': 'Customer Name',
-		'modified': '2011-02-26 11:39:45',
-		'modified_by': 'Guest',
-		'name': 'FL04251',
-		'no_copy': None,
 		'oldfieldname': 'customer_name',
 		'oldfieldtype': 'Data',
 		'options': 'Customer',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Timesheet Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '150px'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-26 11:39:45',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'project_name',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 7,
 		'in_filter': 1,
 		'label': 'Project',
-		'modified': '2011-02-26 11:39:45',
-		'modified_by': 'Guest',
-		'name': 'FL04252',
-		'no_copy': None,
 		'oldfieldname': 'project_name',
 		'oldfieldtype': 'Link',
 		'options': 'Project',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Timesheet Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 0,
 		'search_index': 1,
-		'trigger': None,
 		'width': '150px'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-26 11:39:45',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'task_id',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 8,
 		'in_filter': 1,
 		'label': 'Task Id',
-		'modified': '2011-02-26 11:39:45',
-		'modified_by': 'Guest',
-		'name': 'FL04253',
-		'no_copy': None,
 		'oldfieldname': 'task_id',
 		'oldfieldtype': 'Link',
 		'options': 'Ticket',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Timesheet Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
 		'search_index': 1,
-		'trigger': None,
 		'width': '150px'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-26 11:39:45',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'task_name',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 9,
-		'in_filter': None,
 		'label': 'Task Name',
-		'modified': '2011-02-26 11:39:45',
-		'modified_by': 'Guest',
-		'name': 'FL04254',
-		'no_copy': None,
 		'oldfieldname': 'task_name',
 		'oldfieldtype': 'Link',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Timesheet Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 0,
 		'search_index': 0,
-		'trigger': None,
 		'width': '250px'
 	}
 ]
\ No newline at end of file
diff --git a/projects/page/projects/projects.txt b/projects/page/projects/projects.txt
index 60059d9eb0..179614abd8 100644
--- a/projects/page/projects/projects.txt
+++ b/projects/page/projects/projects.txt
@@ -1 +1,27 @@
-[{'creation': '2010-07-13 14:54:32', 'module': 'Projects', 'doctype': 'Page', 'owner': 'Administrator', 'style': None, 'modified_by': 'ashwini@webnotestech.com', 'script': None, 'show_in_menu': None, 'content': None, 'page_name': 'Projects', 'menu_index': None, 'docstatus': 0, 'parent': None, 'standard': 'Yes', 'icon': None, 'name': 'Projects', 'idx': None, 'static_content': None, 'modified': '2010-11-26 09:46:09', 'parenttype': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
+# Page, Projects
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-12-14 10:23:31',
+		'docstatus': 0,
+		'modified': '2010-12-30 14:43:47',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
+		'module': 'Projects',
+		'name': '__common__',
+		'page_name': 'Projects',
+		'standard': 'Yes'
+	},
+
+	# Page, Projects
+	{
+		'doctype': 'Page',
+		'name': 'Projects'
+	}
+]
\ No newline at end of file
diff --git a/projects/search_criteria/projectwise_delivered_qty_and_costs1/projectwise_delivered_qty_and_costs1.js b/projects/search_criteria/projectwise_delivered_qty_and_costs1/projectwise_delivered_qty_and_costs1.js
deleted file mode 100644
index 594c5c07a7..0000000000
--- a/projects/search_criteria/projectwise_delivered_qty_and_costs1/projectwise_delivered_qty_and_costs1.js
+++ /dev/null
@@ -1,16 +0,0 @@
-report.customize_filters = function() {
-  this.hide_all_filters();
-
-  //this.add_filter({fieldname:'item_code', label:'Item Code', fieldtype:'Link', options:'Item',ignore : 1,parent:'Delivery Note Detail'});
-
-  this.filter_fields_dict['Delivery Note'+FILTER_SEP +'Project Name'].df.filter_hide = 0;
-  this.filter_fields_dict['Delivery Note'+FILTER_SEP +'Company'].df.filter_hide = 0;
-  this.filter_fields_dict['Delivery Note'+FILTER_SEP +'Fiscal Year'].df.filter_hide = 0;  
-  this.filter_fields_dict['Delivery Note'+FILTER_SEP +'Customer'].df.filter_hide = 0;
-  this.filter_fields_dict['Delivery Note'+FILTER_SEP +'Customer Name'].df.filter_hide = 0;
-
-  this.filter_fields_dict['Delivery Note'+FILTER_SEP +'Project Name'].df.in_first_page = 1;
-
-  this.filter_fields_dict['Delivery Note'+FILTER_SEP +'Company'].df['report_default'] = sys_defaults.company;
-  this.filter_fields_dict['Delivery Note'+FILTER_SEP +'Fiscal Year'].df['report_default'] = sys_defaults.fiscal_year;
-}
diff --git a/projects/search_criteria/projectwise_delivered_qty_and_costs1/projectwise_delivered_qty_and_costs1.txt b/projects/search_criteria/projectwise_delivered_qty_and_costs1/projectwise_delivered_qty_and_costs1.txt
deleted file mode 100644
index 3c8e53f797..0000000000
--- a/projects/search_criteria/projectwise_delivered_qty_and_costs1/projectwise_delivered_qty_and_costs1.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': 'IFNULL(`tabDelivery Note`.`project_name`,"")!=""',
-		'add_tab': None,
-		'columns': 'Delivery Note\x01ID,Delivery Note\x01Project Name,Delivery Note\x01Customer,Delivery Note\x01Customer Name,Delivery Note Detail\x01Item Code,Delivery Note Detail\x01Item Name,Delivery Note Detail\x01Quantity,Delivery Note\x01Posting Date,Delivery Note\x01% Billed,Delivery Note Detail\x01Amount*',
-		'creation': '2010-09-01 15:47:57',
-		'criteria_name': 'Projectwise Delivered Qty and Costs1',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Delivery Note Detail',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'Submitted','Delivery Note\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2011-05-09 11:21:55',
-		'modified_by': 'Administrator',
-		'module': 'Projects',
-		'name': 'projectwise_delivered_qty_and_costs1',
-		'owner': 'harshada@webnotestech.com',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': 'Delivery Note',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
-		'sort_by': '`tabDelivery Note`.`name`',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/projects/search_criteria/projectwise_delivered_qty_and_costs2/projectwise_delivered_qty_and_costs2.txt b/projects/search_criteria/projectwise_delivered_qty_and_costs2/projectwise_delivered_qty_and_costs2.txt
deleted file mode 100644
index 1d11e743ff..0000000000
--- a/projects/search_criteria/projectwise_delivered_qty_and_costs2/projectwise_delivered_qty_and_costs2.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': None,
-		'add_cond': 'IFNULL(`tabDelivery Note`.`project_name`,"")!=""',
-		'add_tab': None,
-		'columns': 'Delivery Note\x01ID,Delivery Note\x01Project Name,Delivery Note\x01Customer,Delivery Note\x01Customer Name,Delivery Note Detail\x01Item Code,Delivery Note Detail\x01Item Name,Delivery Note Detail\x01Quantity,Delivery Note\x01Posting Date,Delivery Note\x01% Billed,Delivery Note Detail\x01Amount*',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Projectwise Delivered Qty and Costs2',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Delivery Note Detail',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'Submitted','Delivery Note\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2011-05-09 11:22:05',
-		'modified_by': 'Administrator',
-		'module': 'Projects',
-		'name': 'projectwise_delivered_qty_and_costs2',
-		'owner': 'harshada@webnotestech.com',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': 'Delivery Note',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
-		'sort_by': '`tabDelivery Note`.`name`',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/projects/search_criteria/projectwise_pending_qty_and_costs1/projectwise_pending_qty_and_costs1.js b/projects/search_criteria/projectwise_pending_qty_and_costs1/projectwise_pending_qty_and_costs1.js
deleted file mode 100644
index f518e4bc89..0000000000
--- a/projects/search_criteria/projectwise_pending_qty_and_costs1/projectwise_pending_qty_and_costs1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-report.customize_filters = function() {
-  this.hide_all_filters();
-
-  //this.add_filter({fieldname:'item_code', label:'Item Code', fieldtype:'Link', options:'Item',ignore : 1,parent:'Sales Order Detail'});
-
-  this.filter_fields_dict['Sales Order'+FILTER_SEP +'Project Name'].df.filter_hide = 0;
-  this.filter_fields_dict['Sales Order'+FILTER_SEP +'Company'].df.filter_hide = 0;
-  this.filter_fields_dict['Sales Order'+FILTER_SEP +'Fiscal Year'].df.filter_hide = 0;  
-  this.filter_fields_dict['Sales Order'+FILTER_SEP +'Customer'].df.filter_hide = 0;
-  this.filter_fields_dict['Sales Order'+FILTER_SEP +'Customer Name'].df.filter_hide = 0;
-  this.filter_fields_dict['Sales Order'+FILTER_SEP +'Project Name'].df.in_first_page = 1;
-
-  this.filter_fields_dict['Sales Order'+FILTER_SEP +'Company'].df['report_default'] = sys_defaults.company;
-  this.filter_fields_dict['Sales Order'+FILTER_SEP +'Fiscal Year'].df['report_default'] = sys_defaults.fiscal_year;
-}
diff --git a/projects/search_criteria/projectwise_pending_qty_and_costs1/projectwise_pending_qty_and_costs1.txt b/projects/search_criteria/projectwise_pending_qty_and_costs1/projectwise_pending_qty_and_costs1.txt
deleted file mode 100644
index 32e83e1157..0000000000
--- a/projects/search_criteria/projectwise_pending_qty_and_costs1/projectwise_pending_qty_and_costs1.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': "SUM(`tabSales Order Detail`.`qty` - `tabSales Order Detail`.`delivered_qty`) AS 'Pending Qty'\nSUM((`tabSales Order Detail`.`qty` - `tabSales Order Detail`.`delivered_qty`)* `tabSales Order Detail`.basic_rate) AS 'Pending Amount'",
-		'add_cond': '`tabSales Order Detail`.`qty` > `tabSales Order Detail`.`delivered_qty`\nIFNULL(`tabSales Order`.`project_name`,"")!=""\n`tabSales Order`.order_type = \'Sales\'',
-		'add_tab': None,
-		'columns': 'Sales Order\x01ID,Sales Order\x01Project Name,Sales Order\x01Customer,Sales Order\x01Customer Name,Sales Order Detail\x01Item Code,Sales Order Detail\x01Item Name,Sales Order\x01%  Delivered,Sales Order\x01% Billed,Sales Order\x01Sales Order Date,Sales Order\x01Expected Delivery Date',
-		'creation': '2010-09-01 15:47:57',
-		'criteria_name': 'Projectwise Pending Qty and Costs1',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Sales Order Detail',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Order\x01Submitted':1,'Sales Order\x01Status':'Submitted','Sales Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2011-05-09 11:20:54',
-		'modified_by': 'Administrator',
-		'module': 'Projects',
-		'name': 'projectwise_pending_qty_and_costs1',
-		'owner': 'ashwini@webnotestech.com',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': 'Sales Order',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
-		'sort_by': '`tabSales Order`.`name`',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/projects/search_criteria/projectwise_pending_qty_and_costs2/projectwise_pending_qty_and_costs2.js b/projects/search_criteria/projectwise_pending_qty_and_costs2/projectwise_pending_qty_and_costs2.js
deleted file mode 100644
index f518e4bc89..0000000000
--- a/projects/search_criteria/projectwise_pending_qty_and_costs2/projectwise_pending_qty_and_costs2.js
+++ /dev/null
@@ -1,15 +0,0 @@
-report.customize_filters = function() {
-  this.hide_all_filters();
-
-  //this.add_filter({fieldname:'item_code', label:'Item Code', fieldtype:'Link', options:'Item',ignore : 1,parent:'Sales Order Detail'});
-
-  this.filter_fields_dict['Sales Order'+FILTER_SEP +'Project Name'].df.filter_hide = 0;
-  this.filter_fields_dict['Sales Order'+FILTER_SEP +'Company'].df.filter_hide = 0;
-  this.filter_fields_dict['Sales Order'+FILTER_SEP +'Fiscal Year'].df.filter_hide = 0;  
-  this.filter_fields_dict['Sales Order'+FILTER_SEP +'Customer'].df.filter_hide = 0;
-  this.filter_fields_dict['Sales Order'+FILTER_SEP +'Customer Name'].df.filter_hide = 0;
-  this.filter_fields_dict['Sales Order'+FILTER_SEP +'Project Name'].df.in_first_page = 1;
-
-  this.filter_fields_dict['Sales Order'+FILTER_SEP +'Company'].df['report_default'] = sys_defaults.company;
-  this.filter_fields_dict['Sales Order'+FILTER_SEP +'Fiscal Year'].df['report_default'] = sys_defaults.fiscal_year;
-}
diff --git a/projects/search_criteria/projectwise_pending_qty_and_costs2/projectwise_pending_qty_and_costs2.txt b/projects/search_criteria/projectwise_pending_qty_and_costs2/projectwise_pending_qty_and_costs2.txt
deleted file mode 100644
index eaff112dd1..0000000000
--- a/projects/search_criteria/projectwise_pending_qty_and_costs2/projectwise_pending_qty_and_costs2.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-	{
-		'add_col': "SUM(`tabSales Order Detail`.`qty` - `tabSales Order Detail`.`delivered_qty`) AS 'Pending Qty'\nSUM((`tabSales Order Detail`.`qty` - `tabSales Order Detail`.`delivered_qty`)* `tabSales Order Detail`.basic_rate) AS 'Pending Amount'",
-		'add_cond': '`tabSales Order Detail`.`qty` > `tabSales Order Detail`.`delivered_qty`\nIFNULL(`tabSales Order`.`project_name`,"")!=""\n`tabSales Order`.order_type = \'Sales\'',
-		'add_tab': None,
-		'columns': 'Sales Order\x01ID,Sales Order\x01Project Name,Sales Order\x01Customer,Sales Order\x01Customer Name,Sales Order Detail\x01Item Code,Sales Order Detail\x01Item Name,Sales Order\x01%  Delivered,Sales Order\x01% Billed,Sales Order Detail\x01Quantity,Sales Order Detail\x01Amount*',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Projectwise Pending Qty and Costs2',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Sales Order Detail',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Order\x01Saved':1,'Sales Order\x01Submitted':1,'Sales Order\x01Status':'Submitted','Sales Order\x01Company':'Alpha Company','Sales Order\x01Fiscal Year':'2010-2011'}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': '`tabSales Order Detail`.`name`',
-		'idx': None,
-		'modified': '2011-05-09 11:21:04',
-		'modified_by': 'Administrator',
-		'module': 'Projects',
-		'name': 'projectwise_pending_qty_and_costs2',
-		'owner': 'ashwini@webnotestech.com',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': 'Sales Order',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
-		'sort_by': '`tabSales Order`.`name`',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
-	}
-]
\ No newline at end of file
diff --git a/roles/Module Def/Roles/Roles.txt b/roles/Module Def/Roles/Roles.txt
deleted file mode 100644
index 80f1992cd6..0000000000
--- a/roles/Module Def/Roles/Roles.txt	
+++ /dev/null
@@ -1,71 +0,0 @@
-[
-	{
-		'_last_update': None,
-		'creation': '2010-11-30 22:42:12',
-		'disabled': 'No',
-		'docstatus': 0,
-		'doctype': 'Module Def',
-		'doctype_list': None,
-		'file_list': None,
-		'idx': None,
-		'is_hidden': None,
-		'last_updated_date': '2010-11-29 12:02:02',
-		'modified': '2010-09-25 00:00:00',
-		'modified_by': 'Administrator',
-		'module_desc': 'Roles',
-		'module_icon': 'users.png',
-		'module_label': 'Roles',
-		'module_name': 'Roles',
-		'module_page': None,
-		'module_seq': None,
-		'name': 'Roles',
-		'owner': 'Administrator',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
-		'trash_reason': None,
-		'widget_code': None
-	},
-	{
-		'click_function': None,
-		'creation': '2010-11-30 22:42:12',
-		'description': None,
-		'display_name': 'Role',
-		'doc_name': 'Role',
-		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': None,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': 'MDI00208',
-		'owner': 'Administrator',
-		'parent': 'Roles',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 15:04:47',
-		'description': None,
-		'display_name': None,
-		'doc_name': 'Forms',
-		'doc_type': 'Separator',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': None,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': '000003097',
-		'owner': 'Administrator',
-		'parent': 'Roles',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	}
-]
\ No newline at end of file
diff --git a/roles/Role/Administrator/Administrator.txt b/roles/Role/Administrator/Administrator.txt
deleted file mode 100644
index 283b1ff95c..0000000000
--- a/roles/Role/Administrator/Administrator.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'modified_by': 'Administrator', 'name': 'Administrator', 'parent': '', 'creation': '2009-03-12 12:01:57', 'modified': '2009-03-12 12:01:57', 'module': 'Roles', 'doctype': 'Role', 'idx': 0, 'parenttype': '', 'role_name': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': ''}]
\ No newline at end of file
diff --git a/roles/Role/All/All.txt b/roles/Role/All/All.txt
deleted file mode 100644
index 1385f06ca9..0000000000
--- a/roles/Role/All/All.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'modified_by': 'Administrator', 'name': 'All', 'parent': None, 'creation': '2009-03-12 14:40:07', 'modified': '2009-03-12 14:40:07', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'All', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
diff --git a/roles/Role/Guest/Guest.txt b/roles/Role/Guest/Guest.txt
deleted file mode 100644
index 9438a2836a..0000000000
--- a/roles/Role/Guest/Guest.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'modified_by': 'Administrator', 'name': 'Guest', 'parent': None, 'creation': '2009-10-03 16:59:07', 'modified': '2010-01-13 16:45:40', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Guest', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}, {'modified_by': 'Administrator', 'name': 'DEF000069', 'parent': 'Guest', 'defvalue': '1', 'creation': '2009-10-03 16:59:07', 'defkey': 'hide_webnotes_toolbar', 'modified': '2010-01-13 16:45:40', 'doctype': 'DefaultValue', 'idx': 1, 'parenttype': 'Role', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': 'defaults'}, {'modified_by': 'Administrator', 'name': 'DEF000133', 'parent': 'Guest', 'defvalue': '1', 'creation': '2010-01-13 16:45:40', 'defkey': 'hide_sidebars', 'modified': '2010-01-13 16:45:40', 'doctype': 'DefaultValue', 'idx': 2, 'parenttype': 'Role', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': 'defaults'}]
\ No newline at end of file
diff --git a/roles/doctype/role/role.txt b/roles/doctype/role/role.txt
deleted file mode 100644
index f6e3f6cd13..0000000000
--- a/roles/doctype/role/role.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-12 12:01:55', 'search_fields': '', 'module': 'Roles', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': 0, 'allow_email': 0, 'dt_template': None, 'hide_heading': 0, 'issingle': 0, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 7, 'menu_index': None, 'docstatus': 0, 'allow_copy': 0, 'istable': 0, 'description': '', 'parent': '', 'server_code': '', 'allow_trash': None, 'allow_print': 0, 'autoname': 'field:role_name', 'client_script_core': '', 'client_string': None, 'use_template': None, 'modified_by': 'Guest', 'document_type': None, 'name': 'Role', 'idx': 0, 'hide_toolbar': 0, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': '', 'read_only_onload': None, 'server_code_core': '', 'server_code_compiled': None, 'parent_node': None, 'parentfield': ''}, {'cancel': 0, 'amend': None, 'execute': 0, 'modified_by': 'Guest', 'name': 'PERM00014', 'parent': 'Role', 'read': 1, 'create': 1, 'creation': '2009-03-12 12:01:57', 'modified': '2010-04-08 12:05:09', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': '', 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-03-17 12:09:47', 'doctype': 'DocField', 'oldfieldname': 'module', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Guest', 'label': 'Module', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Role', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01437', 'idx': 1, 'default': 'Roles', 'colour': None, 'modified': '2010-04-08 12:05:09', 'parenttype': 'DocType', 'fieldname': 'module', 'fieldtype': 'Select', 'options': 'link:Module Def', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:01:56', 'doctype': 'DocField', 'oldfieldname': 'role_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Guest', 'label': 'Role Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Role', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00194', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-04-08 12:05:09', 'parenttype': 'DocType', 'fieldname': 'role_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Table', 'creation': '2009-03-12 12:01:56', 'doctype': 'DocField', 'oldfieldname': 'defaults', 'owner': 'Administrator', 'reqd': 0, 'in_filter': 0, 'print_hide': None, 'modified_by': 'Guest', 'label': 'Defaults', 'width': '', 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 0, 'description': None, 'parent': 'Role', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL00195', 'idx': 3, 'default': '', 'colour': '', 'modified': '2010-04-08 12:05:09', 'parenttype': 'DocType', 'fieldname': 'defaults', 'fieldtype': 'Table', 'options': 'DefaultValue', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/mapper/DocType Mapper/Delivery Note-Installation Note/Delivery Note-Installation Note.txt b/selling/DocType Mapper/Delivery Note-Installation Note/Delivery Note-Installation Note.txt
similarity index 100%
rename from mapper/DocType Mapper/Delivery Note-Installation Note/Delivery Note-Installation Note.txt
rename to selling/DocType Mapper/Delivery Note-Installation Note/Delivery Note-Installation Note.txt
diff --git a/mapper/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt b/selling/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt
similarity index 100%
rename from mapper/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt
rename to selling/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt
diff --git a/mapper/DocType Mapper/Lead-Customer/Lead-Customer.txt b/selling/DocType Mapper/Lead-Customer/Lead-Customer.txt
similarity index 100%
rename from mapper/DocType Mapper/Lead-Customer/Lead-Customer.txt
rename to selling/DocType Mapper/Lead-Customer/Lead-Customer.txt
diff --git a/mapper/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt b/selling/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt
similarity index 100%
rename from mapper/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt
rename to selling/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt
diff --git a/mapper/DocType Mapper/Project-Sales Order/Project-Sales Order.txt b/selling/DocType Mapper/Project-Sales Order/Project-Sales Order.txt
similarity index 100%
rename from mapper/DocType Mapper/Project-Sales Order/Project-Sales Order.txt
rename to selling/DocType Mapper/Project-Sales Order/Project-Sales Order.txt
diff --git a/mapper/DocType Mapper/Quotation-Sales Order/Quotation-Sales Order.txt b/selling/DocType Mapper/Quotation-Sales Order/Quotation-Sales Order.txt
similarity index 100%
rename from mapper/DocType Mapper/Quotation-Sales Order/Quotation-Sales Order.txt
rename to selling/DocType Mapper/Quotation-Sales Order/Quotation-Sales Order.txt
diff --git a/crm/Module Def/CRM/CRM.txt b/selling/Module Def/Selling/Selling.txt
similarity index 72%
rename from crm/Module Def/CRM/CRM.txt
rename to selling/Module Def/Selling/Selling.txt
index 815a95c6ec..5500cb3e74 100644
--- a/crm/Module Def/CRM/CRM.txt	
+++ b/selling/Module Def/Selling/Selling.txt	
@@ -1,24 +1,24 @@
 [
 	{
 		'_last_update': None,
-		'creation': '2010-11-30 17:31:24',
+		'creation': '2011-06-30 15:45:03',
 		'disabled': 'No',
 		'docstatus': 0,
-		'doctype': 'Module Def',
+		'doctype': u'Module Def',
 		'doctype_list': 'Print Format, Sales Order\nPrint Format, Quotation Format\nPrint Format, Delivery Note Format',
 		'file_list': 'crm.gif,FileData/00208',
 		'idx': None,
 		'is_hidden': 'No',
-		'last_updated_date': '2010-12-09 17:04:58',
-		'modified': '2011-02-24 17:36:51',
+		'last_updated_date': None,
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
 		'module_desc': 'Manage you sales team, with your leads, customers, quotes, orders etc.',
 		'module_icon': 'Selling.gif',
 		'module_label': 'Selling',
-		'module_name': 'CRM',
+		'module_name': 'Selling',
 		'module_page': None,
-		'module_seq': 4,
-		'name': 'CRM',
+		'module_seq': 3,
+		'name': 'Selling',
 		'owner': 'Administrator',
 		'parent': None,
 		'parentfield': None,
@@ -28,7 +28,7 @@
 	},
 	{
 		'click_function': None,
-		'creation': '2010-11-30 17:31:24',
+		'creation': '2011-06-30 15:45:03',
 		'description': 'Database of potential customers you need to keep in touch with',
 		'display_name': 'Lead',
 		'doc_name': 'Lead',
@@ -39,17 +39,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 1,
-		'modified': '2011-03-24 15:04:46',
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00067',
+		'name': 'MDI01284',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-11-30 17:31:24',
+		'creation': '2011-06-30 15:45:03',
 		'description': 'Your Customer Database',
 		'display_name': 'Customer',
 		'doc_name': 'Customer',
@@ -60,17 +60,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 2,
-		'modified': '2011-03-24 15:04:46',
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00068',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'CRM',
+		'name': 'MDI01285',
+		'owner': 'Administrator',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-11-30 17:31:24',
+		'creation': '2011-06-30 15:45:03',
 		'description': 'Specific requirements from a Lead / Customer',
 		'display_name': 'Enquiry',
 		'doc_name': 'Enquiry',
@@ -81,17 +81,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 3,
-		'modified': '2011-03-24 15:04:46',
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00069',
+		'name': 'MDI01286',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-11-30 17:31:24',
+		'creation': '2011-06-30 15:45:03',
 		'description': 'Offers you have made to your customers',
 		'display_name': 'Quotation',
 		'doc_name': 'Quotation',
@@ -102,17 +102,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 4,
-		'modified': '2011-03-24 15:04:46',
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00070',
+		'name': 'MDI01287',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-11-30 17:31:24',
+		'creation': '2011-06-30 15:45:03',
 		'description': 'Database of confirmed Sale Orders from your Customers',
 		'display_name': 'Sales Order',
 		'doc_name': 'Sales Order',
@@ -123,17 +123,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 5,
-		'modified': '2011-03-24 15:04:46',
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00071',
+		'name': 'MDI01288',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-11-30 17:31:24',
+		'creation': '2011-06-30 15:45:03',
 		'description': None,
 		'display_name': 'Sales Dashboard',
 		'doc_name': 'Sales Dashboard',
@@ -144,17 +144,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 6,
-		'modified': '2011-03-24 15:04:46',
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00072',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'CRM',
+		'name': 'MDI01289',
+		'owner': 'Administrator',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
+		'creation': '2011-06-30 15:45:03',
 		'description': None,
 		'display_name': None,
 		'doc_name': 'Reports',
@@ -165,17 +165,38 @@
 		'hide': None,
 		'icon': None,
 		'idx': 7,
-		'modified': '2011-03-24 15:04:46',
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00309',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'CRM',
+		'name': 'MDI01290',
+		'owner': 'Administrator',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
+		'creation': '2011-06-30 15:45:03',
+		'description': None,
+		'display_name': 'Gross Profit',
+		'doc_name': 'Delivery Note Detail',
+		'doc_type': 'Reports',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': None,
+		'hide': None,
+		'icon': None,
+		'idx': 8,
+		'modified': '2011-06-30 15:45:03',
+		'modified_by': 'Administrator',
+		'name': 'MDI01291',
+		'owner': 'Administrator',
+		'parent': 'Selling',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:45:03',
 		'description': None,
 		'display_name': 'Territory, Item Group wise GP',
 		'doc_name': 'Delivery Note',
@@ -186,17 +207,38 @@
 		'hide': None,
 		'icon': None,
 		'idx': 9,
-		'modified': '2011-03-24 15:04:46',
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00311',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'CRM',
+		'name': 'MDI01292',
+		'owner': 'Administrator',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
+		'creation': '2011-06-30 15:45:03',
+		'description': None,
+		'display_name': 'Itemwise Sales Details',
+		'doc_name': 'Sales Order Detail',
+		'doc_type': 'Reports',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': None,
+		'hide': None,
+		'icon': None,
+		'idx': 10,
+		'modified': '2011-06-30 15:45:03',
+		'modified_by': 'Administrator',
+		'name': 'MDI01293',
+		'owner': 'Administrator',
+		'parent': 'Selling',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:45:03',
 		'description': None,
 		'display_name': 'Itemwise Delivery Details',
 		'doc_name': 'Delivery Note Detail',
@@ -207,17 +249,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 11,
-		'modified': '2011-03-01 13:53:34',
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00313',
+		'name': 'MDI01294',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
+		'creation': '2011-06-30 15:45:03',
 		'description': None,
 		'display_name': 'Sales Personwise Transaction Summary',
 		'doc_name': 'Sales Person',
@@ -228,17 +270,38 @@
 		'hide': None,
 		'icon': None,
 		'idx': 12,
-		'modified': '2011-03-24 15:04:46',
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00314',
+		'name': 'MDI01295',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
+		'creation': '2011-06-30 15:45:03',
+		'description': None,
+		'display_name': 'Total Target Variance Report',
+		'doc_name': 'Target Detail',
+		'doc_type': 'Reports',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': None,
+		'hide': None,
+		'icon': None,
+		'idx': 13,
+		'modified': '2011-06-30 15:45:03',
+		'modified_by': 'Administrator',
+		'name': 'MDI01296',
+		'owner': 'Administrator',
+		'parent': 'Selling',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:45:03',
 		'description': None,
 		'display_name': 'Sales Persons Target Variance (Item Group wise)',
 		'doc_name': 'Target Detail',
@@ -249,17 +312,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 14,
-		'modified': '2011-03-01 13:53:34',
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00316',
+		'name': 'MDI01297',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
+		'creation': '2011-06-30 15:45:03',
 		'description': None,
 		'display_name': 'Territories Target Variance (Item Group wise)',
 		'doc_name': 'Target Detail',
@@ -270,38 +333,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 15,
-		'modified': '2011-03-24 15:04:46',
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00315',
+		'name': 'MDI01298',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
-		'description': None,
-		'display_name': 'Territories Target Variance (Item Group wise)',
-		'doc_name': 'Target Detail',
-		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 15,
-		'modified': '2011-03-01 13:53:34',
-		'modified_by': 'Administrator',
-		'name': 'MDI00317',
-		'owner': 'Administrator',
-		'parent': 'CRM',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
+		'creation': '2011-06-30 15:45:03',
 		'description': None,
 		'display_name': 'Sales Order Pending Items',
 		'doc_name': 'Sales Order Detail',
@@ -312,17 +354,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 16,
-		'modified': '2011-03-01 13:53:34',
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00318',
+		'name': 'MDI01299',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
+		'creation': '2011-06-30 15:45:03',
 		'description': None,
 		'display_name': 'Sales Orderwise Booking & Delivery Summary',
 		'doc_name': 'Sales Order Detail',
@@ -333,17 +375,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 17,
-		'modified': '2011-03-01 13:53:34',
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00319',
+		'name': 'MDI01300',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
+		'creation': '2011-06-30 15:45:03',
 		'description': None,
 		'display_name': 'Sales Orderwise Pending Qty To Deliver',
 		'doc_name': 'Sales Order Detail',
@@ -354,20 +396,20 @@
 		'hide': None,
 		'icon': None,
 		'idx': 18,
-		'modified': '2011-03-01 13:53:34',
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00320',
+		'name': 'MDI01301',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
+		'creation': '2011-06-30 15:45:03',
 		'description': None,
-		'display_name': 'Sales Orderwise Pending Packing Item Summary',
-		'doc_name': 'Delivery Note Packing Detail',
+		'display_name': 'Sales Orderwise Pending Amount To Bill',
+		'doc_name': 'Sales Order Detail',
 		'doc_type': 'Reports',
 		'docstatus': 0,
 		'doctype': 'Module Def Item',
@@ -375,59 +417,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 19,
-		'modified': '2011-03-24 15:04:46',
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00321',
+		'name': 'MDI01302',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
-		'description': None,
-		'display_name': 'Sales Orderwise Pending Amount To Bill',
-		'doc_name': 'Sales Order Detail',
-		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 20,
-		'modified': '2011-03-24 15:04:46',
-		'modified_by': 'Administrator',
-		'name': 'MDI00312',
-		'owner': 'Administrator',
-		'parent': 'CRM',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
-		'description': None,
-		'display_name': 'Sales Orderwise Pending Amount To Bill',
-		'doc_name': 'Sales Order Detail',
-		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 20,
-		'modified': '2011-03-01 13:53:34',
-		'modified_by': 'Administrator',
-		'name': 'MDI00322',
-		'owner': 'Administrator',
-		'parent': 'CRM',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
+		'creation': '2011-06-30 15:45:03',
 		'description': None,
 		'display_name': 'Delivered Items to be Install',
 		'doc_name': 'Delivery Note Detail',
@@ -437,39 +437,18 @@
 		'fields': None,
 		'hide': None,
 		'icon': None,
-		'idx': 21,
-		'modified': '2011-03-24 15:04:46',
+		'idx': 20,
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00310',
+		'name': 'MDI01303',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
-		'description': None,
-		'display_name': 'Delivered Items to be Install',
-		'doc_name': 'Delivery Note Detail',
-		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 21,
-		'modified': '2011-03-01 13:53:34',
-		'modified_by': 'Administrator',
-		'name': 'MDI00323',
-		'owner': 'Administrator',
-		'parent': 'CRM',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
+		'creation': '2011-06-30 15:45:03',
 		'description': None,
 		'display_name': 'Itemwise Price List',
 		'doc_name': 'Ref Rate Detail',
@@ -479,18 +458,18 @@
 		'fields': None,
 		'hide': None,
 		'icon': None,
-		'idx': 22,
-		'modified': '2011-03-24 15:04:46',
+		'idx': 21,
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00324',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'CRM',
+		'name': 'MDI01304',
+		'owner': 'Administrator',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
+		'creation': '2011-06-30 15:45:03',
 		'description': None,
 		'display_name': 'Follow-up Report',
 		'doc_name': 'Follow up',
@@ -500,18 +479,18 @@
 		'fields': None,
 		'hide': None,
 		'icon': None,
-		'idx': 23,
-		'modified': '2011-03-24 15:04:46',
+		'idx': 22,
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00325',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'CRM',
+		'name': 'MDI01305',
+		'owner': 'Administrator',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
+		'creation': '2011-06-30 15:45:03',
 		'description': 'Ledger details of your debtors',
 		'display_name': "Debtor's Ledger",
 		'doc_name': 'GL Entry',
@@ -521,18 +500,18 @@
 		'fields': None,
 		'hide': None,
 		'icon': None,
-		'idx': 24,
-		'modified': '2011-03-24 15:04:46',
+		'idx': 23,
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00326',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'CRM',
+		'name': 'MDI01306',
+		'owner': 'Administrator',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
+		'creation': '2011-06-30 15:45:03',
 		'description': 'Customer Category',
 		'display_name': 'Customer Group',
 		'doc_name': 'Customer Group',
@@ -542,18 +521,18 @@
 		'fields': 'id\ndescription',
 		'hide': None,
 		'icon': None,
-		'idx': 25,
-		'modified': '2011-03-24 15:04:46',
+		'idx': 24,
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00327',
+		'name': 'MDI01307',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
+		'creation': '2011-06-30 15:45:03',
 		'description': 'Sales person details',
 		'display_name': 'Sales Person',
 		'doc_name': 'Sales Person',
@@ -563,18 +542,18 @@
 		'fields': 'id\nterritory\ndepartment\nmobile_no\nemail_id',
 		'hide': None,
 		'icon': None,
-		'idx': 26,
-		'modified': '2011-03-24 15:04:46',
+		'idx': 25,
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00328',
+		'name': 'MDI01308',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
+		'creation': '2011-06-30 15:45:03',
 		'description': 'Item master',
 		'display_name': 'Item',
 		'doc_name': 'Item',
@@ -584,18 +563,18 @@
 		'fields': 'name\nitem_group\ndescription',
 		'hide': None,
 		'icon': None,
-		'idx': 27,
-		'modified': '2011-03-24 15:04:46',
+		'idx': 26,
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00329',
+		'name': 'MDI01309',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
+		'creation': '2011-06-30 15:45:03',
 		'description': 'Sales partner details',
 		'display_name': 'Sales Partner',
 		'doc_name': 'Sales Partner',
@@ -605,18 +584,18 @@
 		'fields': 'id\npartner_type\nmobile\nemail\nterritory',
 		'hide': None,
 		'icon': None,
-		'idx': 28,
-		'modified': '2011-03-24 15:04:46',
+		'idx': 27,
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00330',
+		'name': 'MDI01310',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2011-03-01 13:53:34',
+		'creation': '2011-06-30 15:45:03',
 		'description': 'Business campaigns',
 		'display_name': 'Campaign',
 		'doc_name': 'Campaign',
@@ -626,67 +605,67 @@
 		'fields': 'id\ncampaign_name\ndescription',
 		'hide': None,
 		'icon': None,
-		'idx': 29,
-		'modified': '2011-03-24 15:04:46',
+		'idx': 28,
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDI00331',
+		'name': 'MDI01311',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
-		'creation': '2010-11-30 17:31:24',
+		'creation': '2011-06-30 15:45:03',
 		'docstatus': 0,
 		'doctype': 'Module Def Role',
 		'idx': 1,
-		'modified': '2010-11-30 17:31:24',
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDR00008',
+		'name': 'MDR00328',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'roles',
 		'parenttype': 'Module Def',
 		'role': 'Administrator'
 	},
 	{
-		'creation': '2010-11-30 17:31:24',
+		'creation': '2011-06-30 15:45:03',
 		'docstatus': 0,
 		'doctype': 'Module Def Role',
 		'idx': 2,
-		'modified': '2010-11-30 17:31:24',
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDR00009',
+		'name': 'MDR00329',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'roles',
 		'parenttype': 'Module Def',
 		'role': 'Sales Manager'
 	},
 	{
-		'creation': '2010-11-30 17:31:24',
+		'creation': '2011-06-30 15:45:03',
 		'docstatus': 0,
 		'doctype': 'Module Def Role',
 		'idx': 3,
-		'modified': '2010-11-30 17:31:24',
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDR00010',
+		'name': 'MDR00330',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'roles',
 		'parenttype': 'Module Def',
 		'role': 'Sales User'
 	},
 	{
-		'creation': '2010-11-30 17:31:24',
+		'creation': '2011-06-30 15:45:03',
 		'docstatus': 0,
 		'doctype': 'Module Def Role',
 		'idx': 4,
-		'modified': '2010-11-30 17:31:24',
+		'modified': '2011-06-30 15:45:03',
 		'modified_by': 'Administrator',
-		'name': 'MDR00011',
+		'name': 'MDR00331',
 		'owner': 'Administrator',
-		'parent': 'CRM',
+		'parent': 'Selling',
 		'parentfield': 'roles',
 		'parenttype': 'Module Def',
 		'role': 'Sales Master Manager'
diff --git a/roles/Role/Customer/Customer.txt b/selling/Role/Customer/Customer.txt
similarity index 100%
rename from roles/Role/Customer/Customer.txt
rename to selling/Role/Customer/Customer.txt
diff --git a/roles/Role/Partner/Partner.txt b/selling/Role/Partner/Partner.txt
similarity index 100%
rename from roles/Role/Partner/Partner.txt
rename to selling/Role/Partner/Partner.txt
diff --git a/roles/Role/Sales Manager/Sales Manager.txt b/selling/Role/Sales Manager/Sales Manager.txt
similarity index 100%
rename from roles/Role/Sales Manager/Sales Manager.txt
rename to selling/Role/Sales Manager/Sales Manager.txt
diff --git a/roles/Role/Sales Master Manager/Sales Master Manager.txt b/selling/Role/Sales Master Manager/Sales Master Manager.txt
similarity index 100%
rename from roles/Role/Sales Master Manager/Sales Master Manager.txt
rename to selling/Role/Sales Master Manager/Sales Master Manager.txt
diff --git a/roles/Role/Sales User/Sales User.txt b/selling/Role/Sales User/Sales User.txt
similarity index 100%
rename from roles/Role/Sales User/Sales User.txt
rename to selling/Role/Sales User/Sales User.txt
diff --git a/maintenance/doctype/customer_issue/__init__.py b/selling/__init__.py
similarity index 100%
rename from maintenance/doctype/customer_issue/__init__.py
rename to selling/__init__.py
diff --git a/maintenance/doctype/item_maintenance_detail/__init__.py b/selling/doctype/__init__.py
similarity index 100%
rename from maintenance/doctype/item_maintenance_detail/__init__.py
rename to selling/doctype/__init__.py
diff --git a/maintenance/doctype/maintenance_schedule/__init__.py b/selling/doctype/campaign/__init__.py
similarity index 100%
rename from maintenance/doctype/maintenance_schedule/__init__.py
rename to selling/doctype/campaign/__init__.py
diff --git a/crm/doctype/campaign/campaign.js b/selling/doctype/campaign/campaign.js
similarity index 100%
rename from crm/doctype/campaign/campaign.js
rename to selling/doctype/campaign/campaign.js
diff --git a/selling/doctype/campaign/campaign.txt b/selling/doctype/campaign/campaign.txt
new file mode 100644
index 0000000000..1f1c3a0236
--- /dev/null
+++ b/selling/doctype/campaign/campaign.txt
@@ -0,0 +1,168 @@
+# DocType, Campaign
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:54',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:campaign_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Selling',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 6
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Campaign',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'amend': 0,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Campaign',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'submit': 0
+	},
+
+	# DocType, Campaign
+	{
+		'doctype': 'DocType',
+		'name': 'Campaign'
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Sales Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Sales Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Sales Master Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'Sales User',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Sales User',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 0,
+		'role': 'Sales Master Manager',
+		'write': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 2,
+		'label': 'Campaign',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'campaign_name',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Campaign Name',
+		'oldfieldname': 'campaign_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 4,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'width': '300px'
+	}
+]
\ No newline at end of file
diff --git a/maintenance/doctype/maintenance_schedule_detail/__init__.py b/selling/doctype/customer/__init__.py
similarity index 100%
rename from maintenance/doctype/maintenance_schedule_detail/__init__.py
rename to selling/doctype/customer/__init__.py
diff --git a/crm/doctype/customer/customer.js b/selling/doctype/customer/customer.js
similarity index 100%
rename from crm/doctype/customer/customer.js
rename to selling/doctype/customer/customer.js
diff --git a/crm/doctype/customer/customer.py b/selling/doctype/customer/customer.py
similarity index 100%
rename from crm/doctype/customer/customer.py
rename to selling/doctype/customer/customer.py
diff --git a/selling/doctype/customer/customer.txt b/selling/doctype/customer/customer.txt
new file mode 100644
index 0000000000..364b148faf
--- /dev/null
+++ b/selling/doctype/customer/customer.txt
@@ -0,0 +1,485 @@
+# DocType, Customer
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:56',
+		'docstatus': 0,
+		'modified': '2011-05-26 17:31:31',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1306834669',
+		'allow_print': 0,
+		'allow_trash': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Selling',
+		'name': '__common__',
+		'search_fields': 'customer_name,customer_group,country,territory',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': "eval:'%(customer_name)s'=='%(name)s' ? ' ' : '%(customer_name)s'",
+		'tag_fields': 'customer_group,customer_type',
+		'version': 431
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Customer',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'amend': 0,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Customer',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'submit': 0
+	},
+
+	# DocType, Customer
+	{
+		'doctype': 'DocType',
+		'name': 'Customer'
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Sales Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Sales Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Sales User',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Sales User',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Sales Master Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'Sales Master Manager',
+		'write': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Note: You Can Manage Multiple Address or Contacts via Addresses & Contacts',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Basic Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_name',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'Customer Name',
+		'no_copy': 1,
+		'oldfieldname': 'customer_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 0,
+		'report_hide': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_type',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Customer Type',
+		'oldfieldname': 'customer_type',
+		'oldfieldtype': 'Select',
+		'options': '\nCompany\nIndividual',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'naming_series',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'label': 'Series',
+		'no_copy': 1,
+		'options': '\nCUST\nCUSTMUM',
+		'permlevel': 0,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Fetch lead which will be converted into customer.',
+		'doctype': 'DocField',
+		'fieldname': 'lead_name',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Lead Ref',
+		'no_copy': 1,
+		'oldfieldname': 'lead_name',
+		'oldfieldtype': 'Link',
+		'options': 'Lead',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 6,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'To manage Customer Groups, click here',
+		'doctype': 'DocField',
+		'fieldname': 'customer_group',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 7,
+		'in_filter': 1,
+		'label': 'Customer Group',
+		'oldfieldname': 'customer_group',
+		'oldfieldtype': 'Link',
+		'options': 'Customer Group',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'To manage Territory, click here',
+		'doctype': 'DocField',
+		'fieldname': 'territory',
+		'fieldtype': 'Link',
+		'idx': 8,
+		'label': 'Territory',
+		'oldfieldname': 'territory',
+		'oldfieldtype': 'Link',
+		'options': 'Territory',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 9,
+		'label': 'Address & Contacts',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:doc.__islocal',
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 10,
+		'label': 'Address Desc',
+		'options': 'Addresses will appear only when you save the customer',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 11,
+		'label': 'Address HTML',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 12,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:doc.__islocal',
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 13,
+		'label': 'Contact Desc',
+		'options': 'Contact Details will appear only when you save the customer',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 14,
+		'label': 'Contact HTML',
+		'oldfieldtype': 'HTML',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 15,
+		'label': 'More Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'To create an Account Head under a different company, then set the company and click the button below.',
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 16,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': "Your Customer's TAX registration numbers (if applicable) or any general information",
+		'doctype': 'DocField',
+		'fieldname': 'customer_details',
+		'fieldtype': 'Text',
+		'idx': 17,
+		'label': 'Customer Details',
+		'oldfieldname': 'customer_details',
+		'oldfieldtype': 'Code',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 18,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'credit_days',
+		'fieldtype': 'Int',
+		'idx': 19,
+		'label': 'Credit Days',
+		'oldfieldname': 'credit_days',
+		'oldfieldtype': 'Int',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'credit_limit',
+		'fieldtype': 'Currency',
+		'idx': 20,
+		'label': 'Credit Limit',
+		'oldfieldname': 'credit_limit',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'website',
+		'fieldtype': 'Data',
+		'idx': 21,
+		'label': 'Website',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 22,
+		'label': 'Sales Team',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'default_sales_partner',
+		'fieldtype': 'Link',
+		'idx': 23,
+		'label': 'Default Sales Partner',
+		'oldfieldname': 'default_sales_partner',
+		'oldfieldtype': 'Link',
+		'options': 'Sales Partner',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'default_commission_rate',
+		'fieldtype': 'Currency',
+		'idx': 24,
+		'label': 'Default Commission Rate',
+		'oldfieldname': 'default_commission_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sales_team',
+		'fieldtype': 'Table',
+		'idx': 25,
+		'label': 'Sales Team Details',
+		'oldfieldname': 'sales_team',
+		'oldfieldtype': 'Table',
+		'options': 'Sales Team',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.__islocal',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 26,
+		'label': 'Transaction History',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.__islocal',
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 27,
+		'label': 'History HTML',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 28,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/maintenance/doctype/maintenance_visit/__init__.py b/selling/doctype/enquiry/__init__.py
similarity index 100%
rename from maintenance/doctype/maintenance_visit/__init__.py
rename to selling/doctype/enquiry/__init__.py
diff --git a/crm/doctype/enquiry/enquiry.js b/selling/doctype/enquiry/enquiry.js
similarity index 100%
rename from crm/doctype/enquiry/enquiry.js
rename to selling/doctype/enquiry/enquiry.js
diff --git a/crm/doctype/enquiry/enquiry.py b/selling/doctype/enquiry/enquiry.py
similarity index 100%
rename from crm/doctype/enquiry/enquiry.py
rename to selling/doctype/enquiry/enquiry.py
diff --git a/selling/doctype/enquiry/enquiry.txt b/selling/doctype/enquiry/enquiry.txt
new file mode 100644
index 0000000000..c13ad46956
--- /dev/null
+++ b/selling/doctype/enquiry/enquiry.txt
@@ -0,0 +1,657 @@
+# DocType, Enquiry
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:00',
+		'docstatus': 0,
+		'modified': '2011-05-12 18:27:46',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1305205067',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Transaction',
+		'module': 'Selling',
+		'name': '__common__',
+		'search_fields': 'status,transaction_date,customer,lead,enquiry_type,territory,company',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': 'To %(customer_name)s%(lead_name)s on %(transaction_date)s',
+		'version': 586
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Enquiry',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Enquiry',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Enquiry
+	{
+		'doctype': 'DocType',
+		'name': 'Enquiry'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Sales Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Sales User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 1,
+		'role': 'Sales User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 0,
+		'role': 'Sales Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Enter customer enquiry for which you might raise a quotation in future',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Basic Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'To manage multiple series please go to Setup > Manage Series',
+		'doctype': 'DocField',
+		'fieldname': 'naming_series',
+		'fieldtype': 'Select',
+		'idx': 2,
+		'label': 'Series',
+		'no_copy': 1,
+		'oldfieldname': 'naming_series',
+		'oldfieldtype': 'Select',
+		'options': 'ENQUIRY\nENQ',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'enquiry_from',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Enquiry From',
+		'oldfieldname': 'enquiry_from',
+		'oldfieldtype': 'Select',
+		'options': '\nLead\nCustomer',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'customer',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Customer',
+		'oldfieldname': 'customer',
+		'oldfieldtype': 'Link',
+		'options': 'Customer',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0,
+		'search_index': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_address',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Customer Address',
+		'options': 'Address',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_person',
+		'fieldtype': 'Link',
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Contact Person',
+		'options': 'Contact',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_name',
+		'fieldtype': 'Data',
+		'idx': 7,
+		'label': 'Customer Name',
+		'permlevel': 1,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'lead',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'Lead',
+		'oldfieldname': 'lead',
+		'oldfieldtype': 'Link',
+		'options': 'Lead',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'lead_name',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 9,
+		'label': 'Name',
+		'oldfieldname': 'lead_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'address_display',
+		'fieldtype': 'Small Text',
+		'hidden': 0,
+		'idx': 10,
+		'label': 'Address',
+		'oldfieldname': 'address',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_display',
+		'fieldtype': 'Small Text',
+		'idx': 11,
+		'label': 'Contact',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_mobile',
+		'fieldtype': 'Text',
+		'idx': 12,
+		'label': 'Contact Mobile No',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_email',
+		'fieldtype': 'Text',
+		'idx': 13,
+		'label': 'Contact Email',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 14,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'default': 'Today',
+		'description': 'The date at which current entry is made in system.',
+		'doctype': 'DocField',
+		'fieldname': 'transaction_date',
+		'fieldtype': 'Date',
+		'idx': 15,
+		'label': 'Enquiry Date',
+		'oldfieldname': 'transaction_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1,
+		'width': '50px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'enquiry_type',
+		'fieldtype': 'Select',
+		'idx': 16,
+		'label': 'Enquiry Type',
+		'oldfieldname': 'enquiry_type',
+		'oldfieldtype': 'Select',
+		'options': '\nSales\nMaintenance',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Draft',
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Select',
+		'idx': 17,
+		'label': 'Status',
+		'no_copy': 1,
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Select',
+		'options': '\nDraft\nSubmitted\nQuotation Sent\nOrder Confirmed\nEnquiry Lost\nCancelled',
+		'permlevel': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'idx': 18,
+		'label': 'Amended From',
+		'no_copy': 1,
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'idx': 19,
+		'label': 'Amendment Date',
+		'no_copy': 1,
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'To Manage Territory, click here',
+		'doctype': 'DocField',
+		'fieldname': 'territory',
+		'fieldtype': 'Link',
+		'idx': 20,
+		'in_filter': 1,
+		'label': 'Territory',
+		'options': 'Territory',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'To Manage Customer Groups, click here',
+		'doctype': 'DocField',
+		'fieldname': 'customer_group',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 21,
+		'in_filter': 1,
+		'label': 'Customer Group',
+		'oldfieldname': 'customer_group',
+		'oldfieldtype': 'Link',
+		'options': 'Customer Group',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 22,
+		'label': 'Items',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': "Items which do not exist in Item master can also be entered on customer's request",
+		'doctype': 'DocField',
+		'fieldname': 'enquiry_details',
+		'fieldtype': 'Table',
+		'idx': 23,
+		'label': 'Enquiry Details',
+		'oldfieldname': 'enquiry_details',
+		'oldfieldtype': 'Table',
+		'options': 'Enquiry Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Filing in Additional Information about the Enquiry will help you analyze your data better.',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 24,
+		'label': 'More Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 25,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 26,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 27,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'source',
+		'fieldtype': 'Select',
+		'idx': 28,
+		'label': 'Source',
+		'oldfieldname': 'source',
+		'oldfieldtype': 'Select',
+		'options': "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign\nWalk In",
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Enter name of campaign if source of enquiry is campaign',
+		'doctype': 'DocField',
+		'fieldname': 'campaign',
+		'fieldtype': 'Link',
+		'idx': 29,
+		'label': 'Campaign',
+		'oldfieldname': 'campaign',
+		'oldfieldtype': 'Link',
+		'options': 'Campaign',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.__islocal',
+		'doctype': 'DocField',
+		'fieldname': 'order_lost_reason',
+		'fieldtype': 'Small Text',
+		'idx': 30,
+		'label': 'Order Lost Reason',
+		'no_copy': 1,
+		'oldfieldname': 'order_lost_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1,
+		'report_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 31,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Your sales person who will contact the customer in future',
+		'doctype': 'DocField',
+		'fieldname': 'contact_by',
+		'fieldtype': 'Link',
+		'idx': 32,
+		'in_filter': 1,
+		'label': 'Next Contact By',
+		'oldfieldname': 'contact_by',
+		'oldfieldtype': 'Link',
+		'options': 'Profile',
+		'permlevel': 0,
+		'width': '75px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Your sales person will get a reminder on this date to contact the customer',
+		'doctype': 'DocField',
+		'fieldname': 'contact_date',
+		'fieldtype': 'Date',
+		'idx': 33,
+		'label': 'Next Contact Date',
+		'oldfieldname': 'contact_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 0,
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.__islocal',
+		'description': 'Date on which the lead was last contacted',
+		'doctype': 'DocField',
+		'fieldname': 'last_contact_date',
+		'fieldtype': 'Date',
+		'idx': 34,
+		'label': 'Last Contact Date',
+		'no_copy': 1,
+		'oldfieldname': 'last_contact_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'to_discuss',
+		'fieldtype': 'Small Text',
+		'idx': 35,
+		'label': 'To Discuss',
+		'no_copy': 1,
+		'oldfieldname': 'to_discuss',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Keep a track of communication related to this enquiry which will help for future reference.',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 36,
+		'label': 'Communication History',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'follow_up',
+		'fieldtype': 'Table',
+		'idx': 37,
+		'label': 'Follow Up',
+		'oldfieldname': 'follow_up',
+		'oldfieldtype': 'Table',
+		'options': 'Follow up',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/maintenance/doctype/maintenance_visit_detail/__init__.py b/selling/doctype/enquiry_detail/__init__.py
similarity index 100%
rename from maintenance/doctype/maintenance_visit_detail/__init__.py
rename to selling/doctype/enquiry_detail/__init__.py
diff --git a/selling/doctype/enquiry_detail/enquiry_detail.txt b/selling/doctype/enquiry_detail/enquiry_detail.txt
new file mode 100644
index 0000000000..bd9275b93b
--- /dev/null
+++ b/selling/doctype/enquiry_detail/enquiry_detail.txt
@@ -0,0 +1,145 @@
+# DocType, Enquiry Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:01',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'yogesh@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Selling',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 59
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Enquiry Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Enquiry Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Enquiry Detail'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'reqd': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Item Name',
+		'oldfieldname': 'item_name',
+		'oldfieldtype': 'Data',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 3,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'reqd': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_group',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 6,
+		'label': 'Item Group',
+		'oldfieldname': 'item_group',
+		'oldfieldtype': 'Link',
+		'options': 'Item Group',
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'brand',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 7,
+		'label': 'Brand',
+		'oldfieldname': 'brand',
+		'oldfieldtype': 'Link',
+		'options': 'Brand',
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'basic_rate',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 8,
+		'label': 'Basic Rate',
+		'oldfieldname': 'basic_rate',
+		'oldfieldtype': 'Currency',
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'qty',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'label': 'Qty',
+		'oldfieldname': 'qty',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'uom',
+		'fieldtype': 'Link',
+		'idx': 10,
+		'label': 'UOM',
+		'oldfieldname': 'uom',
+		'oldfieldtype': 'Link',
+		'options': 'UOM'
+	}
+]
\ No newline at end of file
diff --git a/maintenance/doctype/support_ticket_response/__init__.py b/selling/doctype/enquiry_sms_detail/__init__.py
similarity index 100%
rename from maintenance/doctype/support_ticket_response/__init__.py
rename to selling/doctype/enquiry_sms_detail/__init__.py
diff --git a/crm/doctype/enquiry_sms_detail/enquiry_sms_detail.txt b/selling/doctype/enquiry_sms_detail/enquiry_sms_detail.txt
similarity index 100%
rename from crm/doctype/enquiry_sms_detail/enquiry_sms_detail.txt
rename to selling/doctype/enquiry_sms_detail/enquiry_sms_detail.txt
diff --git a/maintenance/search_criteria/__init__.py b/selling/doctype/follow_up/__init__.py
similarity index 100%
rename from maintenance/search_criteria/__init__.py
rename to selling/doctype/follow_up/__init__.py
diff --git a/selling/doctype/follow_up/follow_up.txt b/selling/doctype/follow_up/follow_up.txt
new file mode 100644
index 0000000000..4c1338e1c7
--- /dev/null
+++ b/selling/doctype/follow_up/follow_up.txt
@@ -0,0 +1,94 @@
+# DocType, Follow up
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:02',
+		'docstatus': 0,
+		'modified': '2010-10-13 12:06:26',
+		'modified_by': 'yogesh@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Selling',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 10
+	},
+
+	# These values are common for all DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Follow up',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Follow up
+	{
+		'doctype': 'DocType',
+		'name': 'Follow up'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'date',
+		'fieldtype': 'Date',
+		'idx': 1,
+		'in_filter': 1,
+		'label': 'Date',
+		'oldfieldname': 'date',
+		'oldfieldtype': 'Date'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'notes',
+		'fieldtype': 'Small Text',
+		'idx': 2,
+		'in_filter': 0,
+		'label': 'Notes',
+		'oldfieldname': 'notes',
+		'oldfieldtype': 'Small Text',
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'follow_up_type',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Follow up type',
+		'oldfieldname': 'follow_up_type',
+		'oldfieldtype': 'Select',
+		'options': '\nPhone\nEmail\nSMS\nVisit\nOther'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'follow_up_by',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Follow up by',
+		'oldfieldname': 'follow_up_by',
+		'oldfieldtype': 'Link',
+		'options': 'Sales Person'
+	}
+]
\ No newline at end of file
diff --git a/maintenance/search_criteria/amc_summary/__init__.py b/selling/doctype/industry_type/__init__.py
similarity index 100%
rename from maintenance/search_criteria/amc_summary/__init__.py
rename to selling/doctype/industry_type/__init__.py
diff --git a/crm/doctype/industry_type/industry_type.js b/selling/doctype/industry_type/industry_type.js
similarity index 100%
rename from crm/doctype/industry_type/industry_type.js
rename to selling/doctype/industry_type/industry_type.js
diff --git a/selling/doctype/industry_type/industry_type.txt b/selling/doctype/industry_type/industry_type.txt
new file mode 100644
index 0000000000..71bfa9fa18
--- /dev/null
+++ b/selling/doctype/industry_type/industry_type.txt
@@ -0,0 +1,89 @@
+# DocType, Industry Type
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:04',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'field:industry',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Selling',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 4
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'industry',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Industry',
+		'name': '__common__',
+		'oldfieldname': 'industry',
+		'oldfieldtype': 'Data',
+		'parent': 'Industry Type',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Industry Type',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1
+	},
+
+	# DocType, Industry Type
+	{
+		'doctype': 'DocType',
+		'name': 'Industry Type'
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'Sales Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'Sales User'
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'role': 'Sales Master Manager',
+		'write': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField'
+	}
+]
\ No newline at end of file
diff --git a/maintenance/search_criteria/customer_issues/__init__.py b/selling/doctype/installation_note/__init__.py
similarity index 100%
rename from maintenance/search_criteria/customer_issues/__init__.py
rename to selling/doctype/installation_note/__init__.py
diff --git a/crm/doctype/installation_note/installation_note.js b/selling/doctype/installation_note/installation_note.js
similarity index 100%
rename from crm/doctype/installation_note/installation_note.js
rename to selling/doctype/installation_note/installation_note.js
diff --git a/crm/doctype/installation_note/installation_note.py b/selling/doctype/installation_note/installation_note.py
similarity index 99%
rename from crm/doctype/installation_note/installation_note.py
rename to selling/doctype/installation_note/installation_note.py
index 011785e75c..ce213632c7 100644
--- a/crm/doctype/installation_note/installation_note.py
+++ b/selling/doctype/installation_note/installation_note.py
@@ -128,7 +128,7 @@ class DocType(TransactionBase):
   #----------------------------------------
   def validate_serial_no(self):
     cur_s_no, prevdoc_s_no, sr_list = [], [], []
-    from material_management.doctype.stock_ledger.stock_ledger import get_sr_no_list
+    from stock.doctype.stock_ledger.stock_ledger import get_sr_no_list
     
     for d in getlist(self.doclist, 'installed_item_details'):
       self.is_serial_no_added(d.item_code, d.serial_no)
diff --git a/selling/doctype/installation_note/installation_note.txt b/selling/doctype/installation_note/installation_note.txt
new file mode 100644
index 0000000000..adfce208b1
--- /dev/null
+++ b/selling/doctype/installation_note/installation_note.txt
@@ -0,0 +1,478 @@
+# DocType, Installation Note
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:04',
+		'docstatus': 0,
+		'modified': '2011-05-17 16:34:30',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308741898',
+		'autoname': 'IN/.####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'Selling',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': 'At %(customer_name)s on %(inst_date)s',
+		'version': 96
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Installation Note',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Installation Note',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Installation Note
+	{
+		'doctype': 'DocType',
+		'name': 'Installation Note'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'Sales User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'Sales User'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Sales Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'Sales Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Installation Note',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 2,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'naming_series',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Series',
+		'no_copy': 1,
+		'oldfieldname': 'naming_series',
+		'oldfieldtype': 'Select',
+		'options': '\nIN',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'label': 'Customer',
+		'oldfieldname': 'customer',
+		'oldfieldtype': 'Link',
+		'options': 'Customer',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_address',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'label': 'Customer Address',
+		'options': 'Address',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_person',
+		'fieldtype': 'Link',
+		'idx': 6,
+		'label': 'Contact Person',
+		'options': 'Contact',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'customer_name',
+		'fieldtype': 'Data',
+		'idx': 7,
+		'label': 'Name',
+		'oldfieldname': 'customer_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'reqd': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'address_display',
+		'fieldtype': 'Small Text',
+		'idx': 8,
+		'label': 'Address',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_display',
+		'fieldtype': 'Small Text',
+		'idx': 9,
+		'label': 'Contact',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_mobile',
+		'fieldtype': 'Text',
+		'idx': 10,
+		'label': 'Mobile No',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_email',
+		'fieldtype': 'Text',
+		'idx': 11,
+		'label': 'Contact Email',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'territory',
+		'fieldtype': 'Link',
+		'idx': 12,
+		'in_filter': 1,
+		'label': 'Territory',
+		'options': 'Territory',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_group',
+		'fieldtype': 'Link',
+		'idx': 13,
+		'label': 'Customer Group',
+		'options': 'Customer Group',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 14,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'inst_date',
+		'fieldtype': 'Date',
+		'idx': 15,
+		'label': 'Installation Date',
+		'oldfieldname': 'inst_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'inst_time',
+		'fieldtype': 'Time',
+		'idx': 16,
+		'label': 'Installation Time',
+		'oldfieldname': 'inst_time',
+		'oldfieldtype': 'Time',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'default': 'Draft',
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Select',
+		'idx': 17,
+		'label': 'Status',
+		'no_copy': 1,
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Select',
+		'options': 'Draft\nSubmitted\nCancelled',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Select the relevant company name if you have multiple companies.',
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Select',
+		'idx': 18,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Select',
+		'options': 'link:Company',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 19,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'idx': 20,
+		'label': 'Amended From',
+		'no_copy': 1,
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'The date at which current entry is corrected in the system.',
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'hidden': 1,
+		'idx': 21,
+		'label': 'Amendment Date',
+		'no_copy': 1,
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'remarks',
+		'fieldtype': 'Small Text',
+		'idx': 22,
+		'label': 'Remarks',
+		'oldfieldname': 'remarks',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'cancel_reason',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 23,
+		'label': 'Cancel Reason',
+		'no_copy': 1,
+		'oldfieldname': 'cancel_reason',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 24,
+		'label': 'Item Details',
+		'oldfieldtype': 'Section Break',
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'delivery_note_no',
+		'fieldtype': 'Link',
+		'idx': 25,
+		'label': 'Delivery Note No',
+		'no_copy': 1,
+		'oldfieldname': 'delivery_note_no',
+		'oldfieldtype': 'Link',
+		'options': 'Delivery Note',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'hidden': 0,
+		'idx': 26,
+		'label': 'Get Items',
+		'oldfieldtype': 'Button',
+		'options': 'pull_delivery_note_details',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'installed_item_details',
+		'fieldtype': 'Table',
+		'idx': 27,
+		'label': 'Installed Item Details',
+		'oldfieldname': 'installed_item_details',
+		'oldfieldtype': 'Table',
+		'options': 'Installed Item Details',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/maintenance/search_criteria/customer_issues1/__init__.py b/selling/doctype/installed_item_details/__init__.py
similarity index 100%
rename from maintenance/search_criteria/customer_issues1/__init__.py
rename to selling/doctype/installed_item_details/__init__.py
diff --git a/selling/doctype/installed_item_details/installed_item_details.txt b/selling/doctype/installed_item_details/installed_item_details.txt
new file mode 100644
index 0000000000..7971cb52d2
--- /dev/null
+++ b/selling/doctype/installed_item_details/installed_item_details.txt
@@ -0,0 +1,159 @@
+# DocType, Installed Item Details
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:05',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'abhishek@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'IID/.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Selling',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 24
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Installed Item Details',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Installed Item Details
+	{
+		'doctype': 'DocType',
+		'name': 'Installed Item Details'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_date',
+		'fieldtype': 'Date',
+		'hidden': 0,
+		'idx': 3,
+		'label': 'Delivery Date',
+		'oldfieldname': 'prevdoc_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'serial_no',
+		'fieldtype': 'Small Text',
+		'idx': 5,
+		'label': 'Serial No',
+		'oldfieldname': 'serial_no',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'width': '180px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_detail_docname',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 6,
+		'label': 'Against Document Detail No',
+		'no_copy': 1,
+		'oldfieldname': 'prevdoc_detail_docname',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_docname',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 7,
+		'in_filter': 1,
+		'label': 'Against Document No',
+		'no_copy': 1,
+		'oldfieldname': 'prevdoc_docname',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_doctype',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'Document Type',
+		'no_copy': 1,
+		'oldfieldname': 'prevdoc_doctype',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'qty',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'label': 'Installed Qty',
+		'oldfieldname': 'qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1
+	}
+]
\ No newline at end of file
diff --git a/maintenance/search_criteria/maintenance_orderwise_pending_amount_to_bill/__init__.py b/selling/doctype/lead/__init__.py
similarity index 100%
rename from maintenance/search_criteria/maintenance_orderwise_pending_amount_to_bill/__init__.py
rename to selling/doctype/lead/__init__.py
diff --git a/crm/doctype/lead/lead.js b/selling/doctype/lead/lead.js
similarity index 100%
rename from crm/doctype/lead/lead.js
rename to selling/doctype/lead/lead.js
diff --git a/crm/doctype/lead/lead.py b/selling/doctype/lead/lead.py
similarity index 100%
rename from crm/doctype/lead/lead.py
rename to selling/doctype/lead/lead.py
diff --git a/selling/doctype/lead/lead.txt b/selling/doctype/lead/lead.txt
new file mode 100644
index 0000000000..a476c66577
--- /dev/null
+++ b/selling/doctype/lead/lead.txt
@@ -0,0 +1,787 @@
+# DocType, Lead
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:07',
+		'docstatus': 0,
+		'modified': '2011-05-10 12:15:21',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1305009922',
+		'allow_trash': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Selling',
+		'name': '__common__',
+		'search_fields': 'lead_name,lead_owner,status',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': '%(lead_name)s from %(company_name)s | To Discuss: %(to_discuss)s',
+		'tag_fields': 'status,source',
+		'version': 394
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Lead',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Lead',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Lead
+	{
+		'doctype': 'DocType',
+		'name': 'Lead'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Sales User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'Sales Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'Sales Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Sales User',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 1,
+		'role': 'All'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 7,
+		'permlevel': 0,
+		'role': 'Guest',
+		'write': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Basic Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 2,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'lead_name',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Contact Name',
+		'oldfieldname': 'lead_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'source',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Source',
+		'no_copy': 1,
+		'oldfieldname': 'source',
+		'oldfieldtype': 'Select',
+		'options': "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign\nWebsite",
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': "eval:doc.source == 'Existing Customer'",
+		'doctype': 'DocField',
+		'fieldname': 'customer',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 5,
+		'label': 'From Customer',
+		'oldfieldname': 'customer',
+		'oldfieldtype': 'Link',
+		'options': 'Customer',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': "eval:doc.source == 'Campaign'",
+		'description': 'Enter campaign name if the source of lead is campaign.',
+		'doctype': 'DocField',
+		'fieldname': 'campaign_name',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 6,
+		'label': 'Campaign Name',
+		'oldfieldname': 'campaign_name',
+		'oldfieldtype': 'Link',
+		'options': 'Campaign',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Name of organization from where lead has come',
+		'doctype': 'DocField',
+		'fieldname': 'company_name',
+		'fieldtype': 'Data',
+		'idx': 7,
+		'in_filter': 1,
+		'label': 'Company Name',
+		'oldfieldname': 'company_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 0,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'To manage multiple series please go to Setup > Manage Series',
+		'doctype': 'DocField',
+		'fieldname': 'naming_series',
+		'fieldtype': 'Select',
+		'idx': 8,
+		'label': 'Series',
+		'no_copy': 1,
+		'oldfieldname': 'naming_series',
+		'oldfieldtype': 'Select',
+		'options': '\nLEAD\nLEAD/10-11/\nLEAD/MUMBAI/',
+		'permlevel': 0,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Open',
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Select',
+		'idx': 9,
+		'in_filter': 1,
+		'label': 'Status',
+		'no_copy': 1,
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Select',
+		'options': '\nOpen\nAttempted to Contact\nContact in Future\nContacted\nInterested\nNot interested\nLead Lost\nConverted',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'default': 'Today',
+		'description': 'The date at which current entry is made in system.',
+		'doctype': 'DocField',
+		'fieldname': 'transaction_date',
+		'fieldtype': 'Date',
+		'idx': 10,
+		'in_filter': 1,
+		'label': 'Lead Date',
+		'no_copy': 1,
+		'oldfieldname': 'transaction_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 11,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'type',
+		'fieldtype': 'Select',
+		'idx': 12,
+		'in_filter': 1,
+		'label': 'Lead Type',
+		'oldfieldname': 'type',
+		'oldfieldtype': 'Select',
+		'options': '\nClient\nChannel Partner\nConsultant',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'request_type',
+		'fieldtype': 'Select',
+		'idx': 13,
+		'label': 'Request Type',
+		'oldfieldname': 'request_type',
+		'oldfieldtype': 'Select',
+		'options': '\nProduct Enquiry\nRequest for Information\nSuggestions\nOther',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Probability of lead converting to customer',
+		'doctype': 'DocField',
+		'fieldname': 'rating',
+		'fieldtype': 'Select',
+		'idx': 14,
+		'in_filter': 1,
+		'label': 'Rating',
+		'oldfieldname': 'rating',
+		'oldfieldtype': 'Select',
+		'options': '\nHot\nWarm\nCold',
+		'permlevel': 0,
+		'reqd': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'remark',
+		'fieldtype': 'Small Text',
+		'idx': 15,
+		'label': 'Remark',
+		'oldfieldname': 'remark',
+		'oldfieldtype': 'Text',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 0,
+		'depends_on': "eval:doc.status == 'Lead Lost'",
+		'doctype': 'DocField',
+		'fieldname': 'order_lost_reason',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 16,
+		'label': 'Lost Reason',
+		'oldfieldname': 'order_lost_reason',
+		'oldfieldtype': 'Link',
+		'options': 'Order Lost Reason',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 17,
+		'label': 'Trash Reason',
+		'no_copy': 1,
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 18,
+		'label': 'Contact Info',
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'phone',
+		'fieldtype': 'Data',
+		'idx': 19,
+		'label': 'Phone',
+		'oldfieldname': 'contact_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'mobile_no',
+		'fieldtype': 'Data',
+		'idx': 20,
+		'label': 'Mobile No.',
+		'oldfieldname': 'mobile_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'email_id',
+		'fieldtype': 'Data',
+		'idx': 21,
+		'label': 'Email Id',
+		'oldfieldname': 'email_id',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fax',
+		'fieldtype': 'Data',
+		'idx': 22,
+		'label': 'Fax',
+		'oldfieldname': 'fax',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'website',
+		'fieldtype': 'Data',
+		'idx': 23,
+		'label': 'Website',
+		'oldfieldname': 'website',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'To manage Territory, click here',
+		'doctype': 'DocField',
+		'fieldname': 'territory',
+		'fieldtype': 'Link',
+		'idx': 24,
+		'label': 'Territory',
+		'oldfieldname': 'territory',
+		'oldfieldtype': 'Link',
+		'options': 'Territory',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 25,
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'address_line1',
+		'fieldtype': 'Data',
+		'idx': 26,
+		'label': 'Address Line 1',
+		'oldfieldname': 'address_line1',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'address_line2',
+		'fieldtype': 'Data',
+		'idx': 27,
+		'label': 'Address Line 2',
+		'oldfieldname': 'address_line2',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'city',
+		'fieldtype': 'Data',
+		'idx': 28,
+		'label': 'City',
+		'oldfieldname': 'city',
+		'oldfieldtype': 'Select',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'country',
+		'fieldtype': 'Select',
+		'idx': 29,
+		'label': 'Country',
+		'oldfieldname': 'country',
+		'oldfieldtype': 'Select',
+		'options': 'link:Country',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'state',
+		'fieldtype': 'Data',
+		'idx': 30,
+		'label': 'State',
+		'oldfieldname': 'state',
+		'oldfieldtype': 'Select',
+		'options': 'Suggest',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'pincode',
+		'fieldtype': 'Data',
+		'idx': 31,
+		'label': 'Pin Code',
+		'oldfieldname': 'pincode',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 32,
+		'label': 'More Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 33,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'default': '__user',
+		'doctype': 'DocField',
+		'fieldname': 'lead_owner',
+		'fieldtype': 'Link',
+		'idx': 34,
+		'in_filter': 1,
+		'label': 'Lead Owner',
+		'oldfieldname': 'lead_owner',
+		'oldfieldtype': 'Link',
+		'options': 'Profile',
+		'permlevel': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'market_segment',
+		'fieldtype': 'Select',
+		'hidden': 0,
+		'idx': 35,
+		'in_filter': 1,
+		'label': 'Market Segment',
+		'oldfieldname': 'market_segment',
+		'oldfieldtype': 'Select',
+		'options': '\nLower Income\nMiddle Income\nUpper Income',
+		'permlevel': 0,
+		'reqd': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'industry',
+		'fieldtype': 'Link',
+		'idx': 36,
+		'label': 'Industry',
+		'oldfieldname': 'industry',
+		'oldfieldtype': 'Link',
+		'options': 'Industry Type',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Your products or facilities in which the lead is interested',
+		'doctype': 'DocField',
+		'fieldname': 'interested_in',
+		'fieldtype': 'Data',
+		'idx': 37,
+		'label': 'Interested In',
+		'oldfieldname': 'interested_in',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'hidden': 1,
+		'idx': 38,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 39,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 0,
+		'colour': 'White:FFF',
+		'description': 'Your sales person who will contact the lead in future',
+		'doctype': 'DocField',
+		'fieldname': 'contact_by',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 40,
+		'in_filter': 1,
+		'label': 'Next Contact By',
+		'oldfieldname': 'contact_by',
+		'oldfieldtype': 'Link',
+		'options': 'Profile',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 0,
+		'colour': 'White:FFF',
+		'description': 'Your sales person will get a reminder on this date to contact the lead',
+		'doctype': 'DocField',
+		'fieldname': 'contact_date',
+		'fieldtype': 'Date',
+		'idx': 41,
+		'in_filter': 1,
+		'label': 'Next Contact Date',
+		'no_copy': 1,
+		'oldfieldname': 'contact_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.__islocal',
+		'description': 'Date on which the lead was last contacted',
+		'doctype': 'DocField',
+		'fieldname': 'last_contact_date',
+		'fieldtype': 'Date',
+		'idx': 42,
+		'label': 'Last Contact Date',
+		'no_copy': 1,
+		'oldfieldname': 'last_contact_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 0,
+		'doctype': 'DocField',
+		'fieldname': 'to_discuss',
+		'fieldtype': 'Small Text',
+		'idx': 43,
+		'label': 'To Discuss',
+		'no_copy': 1,
+		'oldfieldname': 'to_discuss',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Keep a track of communication with this lead which will help for future reference.',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 44,
+		'label': 'Communication History',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 0,
+		'doctype': 'DocField',
+		'fieldname': 'follow_up',
+		'fieldtype': 'Table',
+		'idx': 45,
+		'label': 'Follow up',
+		'oldfieldname': 'follow_up',
+		'oldfieldtype': 'Table',
+		'options': 'Follow up',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/maintenance/search_criteria/maintenance_schedule_details/__init__.py b/selling/doctype/lead_attachment_detail/__init__.py
similarity index 100%
rename from maintenance/search_criteria/maintenance_schedule_details/__init__.py
rename to selling/doctype/lead_attachment_detail/__init__.py
diff --git a/crm/doctype/lead_attachment_detail/lead_attachment_detail.txt b/selling/doctype/lead_attachment_detail/lead_attachment_detail.txt
similarity index 100%
rename from crm/doctype/lead_attachment_detail/lead_attachment_detail.txt
rename to selling/doctype/lead_attachment_detail/lead_attachment_detail.txt
diff --git a/maintenance/search_criteria/warranty_amc_expiry_details/__init__.py b/selling/doctype/lead_item_detail/__init__.py
similarity index 100%
rename from maintenance/search_criteria/warranty_amc_expiry_details/__init__.py
rename to selling/doctype/lead_item_detail/__init__.py
diff --git a/crm/doctype/lead_item_detail/lead_item_detail.txt b/selling/doctype/lead_item_detail/lead_item_detail.txt
similarity index 100%
rename from crm/doctype/lead_item_detail/lead_item_detail.txt
rename to selling/doctype/lead_item_detail/lead_item_detail.txt
diff --git a/maintenance/search_criteria/warranty_amc_summary/__init__.py b/selling/doctype/lead_sms_detail/__init__.py
similarity index 100%
rename from maintenance/search_criteria/warranty_amc_summary/__init__.py
rename to selling/doctype/lead_sms_detail/__init__.py
diff --git a/crm/doctype/lead_sms_detail/lead_sms_detail.txt b/selling/doctype/lead_sms_detail/lead_sms_detail.txt
similarity index 100%
rename from crm/doctype/lead_sms_detail/lead_sms_detail.txt
rename to selling/doctype/lead_sms_detail/lead_sms_detail.txt
diff --git a/maintenance/search_criteria/warranty_amc_summary1/__init__.py b/selling/doctype/plot_control/__init__.py
similarity index 100%
rename from maintenance/search_criteria/warranty_amc_summary1/__init__.py
rename to selling/doctype/plot_control/__init__.py
diff --git a/crm/doctype/plot_control/plot_control.py b/selling/doctype/plot_control/plot_control.py
similarity index 100%
rename from crm/doctype/plot_control/plot_control.py
rename to selling/doctype/plot_control/plot_control.py
diff --git a/selling/doctype/plot_control/plot_control.txt b/selling/doctype/plot_control/plot_control.txt
new file mode 100644
index 0000000000..c6564d74ca
--- /dev/null
+++ b/selling/doctype/plot_control/plot_control.txt
@@ -0,0 +1,30 @@
+# DocType, Plot Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:12',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Selling',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 215
+	},
+
+	# DocType, Plot Control
+	{
+		'doctype': 'DocType',
+		'name': 'Plot Control'
+	}
+]
\ No newline at end of file
diff --git a/mapper/__init__.py b/selling/doctype/quotation/__init__.py
similarity index 100%
rename from mapper/__init__.py
rename to selling/doctype/quotation/__init__.py
diff --git a/crm/doctype/quotation/quotation.js b/selling/doctype/quotation/quotation.js
similarity index 100%
rename from crm/doctype/quotation/quotation.js
rename to selling/doctype/quotation/quotation.js
diff --git a/crm/doctype/quotation/quotation.py b/selling/doctype/quotation/quotation.py
similarity index 100%
rename from crm/doctype/quotation/quotation.py
rename to selling/doctype/quotation/quotation.py
diff --git a/selling/doctype/quotation/quotation.txt b/selling/doctype/quotation/quotation.txt
new file mode 100644
index 0000000000..e198b86086
--- /dev/null
+++ b/selling/doctype/quotation/quotation.txt
@@ -0,0 +1,1274 @@
+# DocType, Quotation
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:17',
+		'docstatus': 0,
+		'modified': '2011-06-21 17:17:07',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308741898',
+		'allow_attach': 1,
+		'allow_email': 0,
+		'allow_trash': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Transaction',
+		'hide_toolbar': 0,
+		'is_transaction_doc': 1,
+		'max_attachments': 1,
+		'module': 'Selling',
+		'name': '__common__',
+		'read_only_onload': 1,
+		'search_fields': 'status,transaction_date,customer,lead,order_type',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': 'To %(customer_name)s on %(transaction_date)s worth %(currency)s %(grand_total_export)s',
+		'tag_fields': 'status',
+		'version': 596
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Quotation',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Quotation',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Quotation
+	{
+		'doctype': 'DocType',
+		'name': 'Quotation'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Sales Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Sales Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'Sales User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'Sales User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'match': 'customer_name',
+		'permlevel': 0,
+		'role': 'Customer'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 0,
+		'role': 'Maintenance Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 7,
+		'permlevel': 1,
+		'role': 'Maintenance Manager'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 8,
+		'permlevel': 0,
+		'role': 'Maintenance User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 9,
+		'permlevel': 1,
+		'role': 'Maintenance User'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Basic Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 2,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'To manage multiple series please go to Setup > Manage Series',
+		'doctype': 'DocField',
+		'fieldname': 'naming_series',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Series',
+		'no_copy': 1,
+		'oldfieldname': 'naming_series',
+		'oldfieldtype': 'Select',
+		'options': 'QTN',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'quotation_to',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Quotation To',
+		'oldfieldname': 'quotation_to',
+		'oldfieldtype': 'Select',
+		'options': '\nLead\nCustomer',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'customer',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Customer',
+		'oldfieldname': 'customer',
+		'oldfieldtype': 'Link',
+		'options': 'Customer',
+		'permlevel': 0,
+		'print_hide': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'customer_address',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Customer Address',
+		'options': 'Address',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'contact_person',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 7,
+		'in_filter': 1,
+		'label': 'Contact Person',
+		'oldfieldname': 'contact_person',
+		'oldfieldtype': 'Link',
+		'options': 'Contact',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_name',
+		'fieldtype': 'Data',
+		'idx': 8,
+		'label': 'Name',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'lead',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 9,
+		'in_filter': 1,
+		'label': 'Lead',
+		'oldfieldname': 'lead',
+		'oldfieldtype': 'Link',
+		'options': 'Lead',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'lead_name',
+		'fieldtype': 'Text',
+		'idx': 10,
+		'label': 'Name',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'address_display',
+		'fieldtype': 'Small Text',
+		'hidden': 0,
+		'idx': 11,
+		'in_filter': 0,
+		'label': 'Address',
+		'oldfieldname': 'customer_address',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1,
+		'print_hide': 0,
+		'reqd': 0,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'contact_display',
+		'fieldtype': 'Small Text',
+		'idx': 12,
+		'in_filter': 0,
+		'label': 'Contact',
+		'permlevel': 1,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'contact_mobile',
+		'fieldtype': 'Text',
+		'hidden': 0,
+		'idx': 13,
+		'label': 'Mobile No',
+		'permlevel': 1,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'contact_email',
+		'fieldtype': 'Text',
+		'idx': 14,
+		'label': 'Contact Email',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 15,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'default': 'Today',
+		'description': 'The date at which current entry is made in system.',
+		'doctype': 'DocField',
+		'fieldname': 'transaction_date',
+		'fieldtype': 'Date',
+		'idx': 16,
+		'in_filter': 1,
+		'label': 'Quotation Date',
+		'no_copy': 1,
+		'oldfieldname': 'transaction_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'order_type',
+		'fieldtype': 'Select',
+		'idx': 17,
+		'in_filter': 1,
+		'label': 'Order Type',
+		'oldfieldname': 'order_type',
+		'oldfieldtype': 'Select',
+		'options': '\nSales\nMaintenance',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 0,
+		'colour': 'White:FFF',
+		'default': 'Draft',
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Select',
+		'idx': 18,
+		'in_filter': 1,
+		'label': 'Status',
+		'no_copy': 1,
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Select',
+		'options': '\nDraft\nSubmitted\nOrder Confirmed\nOrder Lost\nCancelled',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'idx': 19,
+		'label': 'Amended From',
+		'no_copy': 1,
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'description': 'The date at which current entry is corrected in the system.',
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'idx': 20,
+		'label': 'Amendment Date',
+		'no_copy': 1,
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': "To create Quotation against Enquiry, Select Enquiry No. and click on 'Pull Enquiry Details' ",
+		'doctype': 'DocField',
+		'fieldname': 'enq_no',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 21,
+		'in_filter': 1,
+		'label': 'Enquiry No',
+		'no_copy': 0,
+		'oldfieldname': 'enq_no',
+		'oldfieldtype': 'Link',
+		'options': 'Enquiry',
+		'permlevel': 0,
+		'print_hide': 0,
+		'report_hide': 0,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'hidden': 0,
+		'idx': 22,
+		'label': 'Pull Enquiry Detail',
+		'no_copy': 0,
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'print_hide': 0,
+		'report_hide': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Will be fetched from Customer',
+		'doctype': 'DocField',
+		'fieldname': 'territory',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 23,
+		'in_filter': 1,
+		'label': 'Territory',
+		'options': 'Territory',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'customer_group',
+		'fieldtype': 'Link',
+		'idx': 24,
+		'in_filter': 1,
+		'label': 'Customer Group',
+		'oldfieldname': 'customer_group',
+		'oldfieldtype': 'Link',
+		'options': 'Customer Group',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 25,
+		'label': 'Items',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0,
+		'print_hide': 0,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 26,
+		'label': 'Clear Table',
+		'oldfieldtype': 'Button',
+		'options': 'clear_quotation_details',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Select the price list as entered in "Price List" master. This will pull the reference rates of items against this price list as specified in "Item" master.',
+		'doctype': 'DocField',
+		'fieldname': 'price_list_name',
+		'fieldtype': 'Select',
+		'idx': 27,
+		'in_filter': 1,
+		'label': 'Price List',
+		'oldfieldname': 'price_list_name',
+		'oldfieldtype': 'Select',
+		'options': 'link:Price List',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 28,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': "Customer's currency - If you want to select a currency that is not the default currency, then you must also specify the Currency Conversion Rate.",
+		'doctype': 'DocField',
+		'fieldname': 'currency',
+		'fieldtype': 'Select',
+		'idx': 29,
+		'in_filter': 1,
+		'label': 'Currency',
+		'oldfieldname': 'currency',
+		'oldfieldtype': 'Select',
+		'options': 'link:Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 0,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': '1.00',
+		'description': "Rate at which customer's currency is converted to your currency",
+		'doctype': 'DocField',
+		'fieldname': 'conversion_rate',
+		'fieldtype': 'Currency',
+		'idx': 30,
+		'label': 'Currency Conversion Rate',
+		'oldfieldname': 'conversion_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 31,
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'description': 'Field Descriptions for Quotation Details\n\nRef Rate: Rate in your selected Price List. Price Lists help you track discounts.\n\nPage Break: If you want to break the page on this item in the Print Format',
+		'doctype': 'DocField',
+		'fieldname': 'quotation_details',
+		'fieldtype': 'Table',
+		'idx': 32,
+		'label': 'Quotation Details',
+		'oldfieldname': 'quotation_details',
+		'oldfieldtype': 'Table',
+		'options': 'Quotation Detail',
+		'permlevel': 0,
+		'width': '40px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'net_total',
+		'fieldtype': 'Currency',
+		'idx': 33,
+		'label': 'Net Total*',
+		'no_copy': 0,
+		'oldfieldname': 'net_total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 34,
+		'label': 'Re-Calculate Values',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 35,
+		'label': 'Note HTML',
+		'oldfieldtype': 'HTML',
+		'options': '
Note : * In Base Currency\n
',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 36,
+		'label': 'Taxes',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'charge',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 37,
+		'label': 'Select Charges Master',
+		'oldfieldname': 'charge',
+		'oldfieldtype': 'Link',
+		'options': 'Other Charges',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'hidden': 0,
+		'idx': 38,
+		'label': 'Get Charges',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'other_charges',
+		'fieldtype': 'Table',
+		'idx': 39,
+		'label': 'Other Charges',
+		'oldfieldname': 'other_charges',
+		'oldfieldtype': 'Table',
+		'options': 'RV Tax Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 40,
+		'label': 'Calculate Charges',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'other_charges_total',
+		'fieldtype': 'Currency',
+		'idx': 41,
+		'label': 'Charges Total*',
+		'oldfieldname': 'other_charges_total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'grand_total',
+		'fieldtype': 'Currency',
+		'idx': 42,
+		'label': 'Grand Total*',
+		'no_copy': 0,
+		'oldfieldname': 'grand_total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0,
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 43,
+		'label': 'Other Charges Calculation',
+		'oldfieldtype': 'HTML',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 44,
+		'label': 'OT Notes',
+		'oldfieldtype': 'HTML',
+		'options': '
Note : * In Base Currency\n
',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 45,
+		'label': 'Totals',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rounded_total',
+		'fieldtype': 'Currency',
+		'idx': 46,
+		'label': 'Rounded Total',
+		'no_copy': 0,
+		'oldfieldname': 'rounded_total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'trigger': 'Client',
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'In Words will be visible once you save the Quotation.',
+		'doctype': 'DocField',
+		'fieldname': 'in_words',
+		'fieldtype': 'Data',
+		'idx': 47,
+		'label': 'In Words',
+		'no_copy': 0,
+		'oldfieldname': 'in_words',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 48,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'print_hide': 1,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'grand_total_export',
+		'fieldtype': 'Currency',
+		'idx': 49,
+		'label': 'Grand Total (Export)',
+		'no_copy': 0,
+		'oldfieldname': 'grand_total_export',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0,
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rounded_total_export',
+		'fieldtype': 'Currency',
+		'idx': 50,
+		'label': 'Rounded Total (Export)',
+		'no_copy': 0,
+		'oldfieldname': 'rounded_total_export',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0,
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'In Words (Export) will be visible once you save the Quotation.',
+		'doctype': 'DocField',
+		'fieldname': 'in_words_export',
+		'fieldtype': 'Data',
+		'idx': 51,
+		'label': 'In Words (Export)',
+		'no_copy': 0,
+		'oldfieldname': 'in_words_export',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Add Terms and Conditions for the Quotation like Payment Terms, Validity of Offer etc. You can also prepare a master Term Sheet and use the Template',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 52,
+		'label': 'Terms',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'letter_head',
+		'fieldtype': 'Select',
+		'idx': 53,
+		'label': 'Letter Head',
+		'oldfieldname': 'letter_head',
+		'oldfieldtype': 'Select',
+		'options': 'link:Letter Head',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tc_name',
+		'fieldtype': 'Link',
+		'idx': 54,
+		'label': 'Select Terms',
+		'oldfieldname': 'tc_name',
+		'oldfieldtype': 'Link',
+		'options': 'Term',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 55,
+		'label': 'Get Terms',
+		'oldfieldtype': 'Button',
+		'options': 'get_tc_details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 56,
+		'label': 'Terms HTML',
+		'oldfieldtype': 'HTML',
+		'options': 'You can add Terms and Notes that will be printed in the Transaction',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'terms',
+		'fieldtype': 'Text Editor',
+		'idx': 57,
+		'label': 'Term Details',
+		'oldfieldname': 'terms',
+		'oldfieldtype': 'Text Editor',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Filling in additional information about the Quotation will help you analyze your data better.',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 58,
+		'label': 'More Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Select the relevant company name if you have multiple companies.',
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 59,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client',
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 60,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'enq_det',
+		'fieldtype': 'Text',
+		'hidden': 1,
+		'idx': 61,
+		'label': 'Enquiry Detail',
+		'no_copy': 0,
+		'oldfieldname': 'enq_det',
+		'oldfieldtype': 'Text',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'source',
+		'fieldtype': 'Select',
+		'hidden': 0,
+		'idx': 62,
+		'label': 'Source',
+		'no_copy': 0,
+		'oldfieldname': 'source',
+		'oldfieldtype': 'Select',
+		'options': "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'campaign',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 63,
+		'label': 'Campaign',
+		'no_copy': 0,
+		'oldfieldname': 'campaign',
+		'oldfieldtype': 'Link',
+		'options': 'Campaign',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'select_print_heading',
+		'fieldtype': 'Link',
+		'idx': 64,
+		'label': 'Select Print Heading',
+		'no_copy': 1,
+		'oldfieldname': 'select_print_heading',
+		'oldfieldtype': 'Link',
+		'options': 'Print Heading',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'cancel_reason',
+		'fieldtype': 'Data',
+		'idx': 65,
+		'label': 'Cancel Reason',
+		'no_copy': 1,
+		'oldfieldname': 'cancel_reason',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'order_lost_reason',
+		'fieldtype': 'Small Text',
+		'idx': 66,
+		'label': 'Order Lost Reason',
+		'no_copy': 1,
+		'oldfieldname': 'order_lost_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 67,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'print_hide': 1,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'description': 'Your sales person who will contact the customer/lead in future',
+		'doctype': 'DocField',
+		'fieldname': 'contact_by',
+		'fieldtype': 'Link',
+		'idx': 68,
+		'label': 'Next Contact By',
+		'oldfieldname': 'contact_by',
+		'oldfieldtype': 'Link',
+		'options': 'Profile',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'description': 'Your sales person will get a reminder on this date to contact the customer/lead',
+		'doctype': 'DocField',
+		'fieldname': 'contact_date',
+		'fieldtype': 'Date',
+		'idx': 69,
+		'label': 'Next Contact Date',
+		'oldfieldname': 'contact_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Date on which the lead/customer was last contacted',
+		'doctype': 'DocField',
+		'fieldname': 'last_contact_date',
+		'fieldtype': 'Date',
+		'idx': 70,
+		'label': 'Last Contact Date',
+		'no_copy': 1,
+		'oldfieldname': 'last_contact_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'to_discuss',
+		'fieldtype': 'Small Text',
+		'idx': 71,
+		'label': 'To Discuss',
+		'oldfieldname': 'to_discuss',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Keep a track on communications regarding this Quotation. This will help you remember earlier communications in case the Customer comes back again',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 72,
+		'label': 'Communication History',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'follow_up',
+		'fieldtype': 'Table',
+		'idx': 73,
+		'label': 'Follow up',
+		'oldfieldname': 'follow_up',
+		'oldfieldtype': 'Table',
+		'options': 'Follow up',
+		'permlevel': 0,
+		'print_hide': 1,
+		'width': '40px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'file_list',
+		'fieldtype': 'Small Text',
+		'hidden': 1,
+		'idx': 74,
+		'label': 'File List',
+		'no_copy': 1,
+		'permlevel': 0,
+		'print_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/material_management/__init__.py b/selling/doctype/quotation_detail/__init__.py
similarity index 100%
rename from material_management/__init__.py
rename to selling/doctype/quotation_detail/__init__.py
diff --git a/selling/doctype/quotation_detail/quotation_detail.txt b/selling/doctype/quotation_detail/quotation_detail.txt
new file mode 100644
index 0000000000..074443bd26
--- /dev/null
+++ b/selling/doctype/quotation_detail/quotation_detail.txt
@@ -0,0 +1,347 @@
+# DocType, Quotation Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:18',
+		'docstatus': 0,
+		'modified': '2011-02-23 11:28:36',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'QUOD/.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'is_transaction_doc': 0,
+		'istable': 1,
+		'module': 'Selling',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 26
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Quotation Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Quotation Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Quotation Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 1,
+		'in_filter': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client',
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'Item Name',
+		'oldfieldname': 'item_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Small Text',
+		'idx': 3,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'qty',
+		'fieldtype': 'Currency',
+		'idx': 4,
+		'in_filter': 0,
+		'label': 'Quantity',
+		'oldfieldname': 'qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 1,
+		'search_index': 0,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_uom',
+		'fieldtype': 'Data',
+		'idx': 5,
+		'label': 'UOM',
+		'oldfieldname': 'stock_uom',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'reqd': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'ref_rate',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'label': 'Ref Rate',
+		'oldfieldname': 'ref_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'adj_rate',
+		'fieldtype': 'Float',
+		'idx': 7,
+		'label': 'Discount (%)',
+		'oldfieldname': 'adj_rate',
+		'oldfieldtype': 'Float',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'export_rate',
+		'fieldtype': 'Currency',
+		'idx': 8,
+		'in_filter': 0,
+		'label': 'Rate',
+		'oldfieldname': 'export_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 0,
+		'search_index': 0,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'export_amount',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'in_filter': 0,
+		'label': 'Amount',
+		'oldfieldname': 'export_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 0,
+		'reqd': 0,
+		'search_index': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'base_ref_rate',
+		'fieldtype': 'Currency',
+		'idx': 10,
+		'label': 'Ref Rate*',
+		'oldfieldname': 'base_ref_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'basic_rate',
+		'fieldtype': 'Currency',
+		'idx': 11,
+		'in_filter': 0,
+		'label': 'Basic Rate*',
+		'oldfieldname': 'basic_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0,
+		'search_index': 0,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'amount',
+		'fieldtype': 'Currency',
+		'idx': 12,
+		'in_filter': 0,
+		'label': 'Amount*',
+		'oldfieldname': 'amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0,
+		'search_index': 0,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_group',
+		'fieldtype': 'Link',
+		'idx': 13,
+		'in_filter': 1,
+		'label': 'Item Group',
+		'oldfieldname': 'item_group',
+		'oldfieldtype': 'Link',
+		'options': 'Item Group',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'brand',
+		'fieldtype': 'Link',
+		'idx': 14,
+		'in_filter': 1,
+		'label': 'Brand',
+		'oldfieldname': 'brand',
+		'oldfieldtype': 'Link',
+		'options': 'Brand',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'page_break',
+		'fieldtype': 'Check',
+		'hidden': 0,
+		'idx': 15,
+		'label': 'Page Break',
+		'no_copy': 1,
+		'oldfieldname': 'page_break',
+		'oldfieldtype': 'Check',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_tax_rate',
+		'fieldtype': 'Small Text',
+		'hidden': 1,
+		'idx': 16,
+		'label': 'Item Tax Rate',
+		'oldfieldname': 'item_tax_rate',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_docname',
+		'fieldtype': 'Data',
+		'idx': 17,
+		'label': 'Against Docname',
+		'no_copy': 1,
+		'oldfieldname': 'prevdoc_docname',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 0,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_doctype',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 18,
+		'label': 'Against Doctype',
+		'no_copy': 1,
+		'oldfieldname': 'prevdoc_doctype',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 0,
+		'width': '150px'
+	}
+]
\ No newline at end of file
diff --git a/material_management/doctype/__init__.py b/selling/doctype/return_detail/__init__.py
similarity index 100%
rename from material_management/doctype/__init__.py
rename to selling/doctype/return_detail/__init__.py
diff --git a/selling/doctype/return_detail/return_detail.txt b/selling/doctype/return_detail/return_detail.txt
new file mode 100644
index 0000000000..7091b3f382
--- /dev/null
+++ b/selling/doctype/return_detail/return_detail.txt
@@ -0,0 +1,150 @@
+# DocType, Return Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:19',
+		'docstatus': 0,
+		'modified': '2011-02-23 19:09:05',
+		'modified_by': 'Administrator',
+		'owner': 'wasim@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Selling',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 8
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Return Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Return Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Return Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'uom',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'label': 'UOM',
+		'oldfieldname': 'uom',
+		'oldfieldtype': 'Link',
+		'options': 'UOM',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rate',
+		'fieldtype': 'Currency',
+		'idx': 4,
+		'label': 'Rate',
+		'oldfieldname': 'rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'qty',
+		'fieldtype': 'Data',
+		'idx': 5,
+		'label': 'Qty',
+		'oldfieldname': 'qty',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'returned_qty',
+		'fieldtype': 'Data',
+		'idx': 6,
+		'label': 'Returned Qty',
+		'oldfieldname': 'returned_qty',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'serial_no',
+		'fieldtype': 'Small Text',
+		'idx': 7,
+		'label': 'Serial No',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'batch_no',
+		'fieldtype': 'Data',
+		'idx': 8,
+		'label': 'Batch No',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'detail_name',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 9,
+		'label': 'Detail Name',
+		'oldfieldname': 'detail_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/material_management/doctype/batch/__init__.py b/selling/doctype/sales_common/__init__.py
similarity index 100%
rename from material_management/doctype/batch/__init__.py
rename to selling/doctype/sales_common/__init__.py
diff --git a/crm/doctype/sales_common/sales_common.js b/selling/doctype/sales_common/sales_common.js
similarity index 100%
rename from crm/doctype/sales_common/sales_common.js
rename to selling/doctype/sales_common/sales_common.js
diff --git a/crm/doctype/sales_common/sales_common.py b/selling/doctype/sales_common/sales_common.py
similarity index 100%
rename from crm/doctype/sales_common/sales_common.py
rename to selling/doctype/sales_common/sales_common.py
diff --git a/selling/doctype/sales_common/sales_common.txt b/selling/doctype/sales_common/sales_common.txt
new file mode 100644
index 0000000000..4b0cf28348
--- /dev/null
+++ b/selling/doctype/sales_common/sales_common.txt
@@ -0,0 +1,31 @@
+# DocType, Sales Common
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:21',
+		'docstatus': 0,
+		'modified': '2011-01-03 11:21:04',
+		'modified_by': 'nabin@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Selling',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 290
+	},
+
+	# DocType, Sales Common
+	{
+		'doctype': 'DocType',
+		'name': 'Sales Common'
+	}
+]
\ No newline at end of file
diff --git a/material_management/doctype/bin/__init__.py b/selling/doctype/sales_order/__init__.py
similarity index 100%
rename from material_management/doctype/bin/__init__.py
rename to selling/doctype/sales_order/__init__.py
diff --git a/crm/doctype/sales_order/sales_order.js b/selling/doctype/sales_order/sales_order.js
similarity index 100%
rename from crm/doctype/sales_order/sales_order.js
rename to selling/doctype/sales_order/sales_order.js
diff --git a/crm/doctype/sales_order/sales_order.py b/selling/doctype/sales_order/sales_order.py
similarity index 100%
rename from crm/doctype/sales_order/sales_order.py
rename to selling/doctype/sales_order/sales_order.py
diff --git a/selling/doctype/sales_order/sales_order.txt b/selling/doctype/sales_order/sales_order.txt
new file mode 100644
index 0000000000..69773ddf72
--- /dev/null
+++ b/selling/doctype/sales_order/sales_order.txt
@@ -0,0 +1,1371 @@
+# DocType, Sales Order
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:21',
+		'docstatus': 0,
+		'modified': '2011-06-27 16:05:56',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1309170956',
+		'client_script': "cur_frm.add_fetch('customer','sales_person','sales_person');",
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Transaction',
+		'is_transaction_doc': 1,
+		'issingle': 0,
+		'module': 'Selling',
+		'name': '__common__',
+		'read_only_onload': 1,
+		'search_fields': 'status,transaction_date,customer,customer_name, territory,order_type,company',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': 'From %(customer_name)s on %(transaction_date)s worth %(currency)s %(grand_total_export)s | %(per_delivered)s% delivered | %(per_billed)s% billed',
+		'tag_fields': 'delivery_status,billing_status',
+		'version': 593
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Sales Order',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Sales Order',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Sales Order
+	{
+		'doctype': 'DocType',
+		'name': 'Sales Order'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Sales Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Sales Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'Sales User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'Sales User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'match': 'customer_name',
+		'permlevel': 0,
+		'role': 'Customer'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 2,
+		'role': 'Accounts User',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 7,
+		'permlevel': 0,
+		'role': 'Maintenance Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 8,
+		'permlevel': 1,
+		'role': 'Maintenance Manager'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 9,
+		'permlevel': 0,
+		'role': 'Maintenance User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 10,
+		'permlevel': 1,
+		'role': 'Maintenance User'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Basic Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 2,
+		'in_filter': 0,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'search_index': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'To manage multiple series please go to Setup > Manage Series',
+		'doctype': 'DocField',
+		'fieldname': 'naming_series',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Series',
+		'no_copy': 1,
+		'oldfieldname': 'naming_series',
+		'oldfieldtype': 'Select',
+		'options': 'SO\nSO/10-11/',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Select Customer',
+		'doctype': 'DocField',
+		'fieldname': 'customer',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Customer',
+		'oldfieldname': 'customer',
+		'oldfieldtype': 'Link',
+		'options': 'Customer',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_address',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Customer Address',
+		'options': 'Address',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_person',
+		'fieldtype': 'Link',
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Contact Person',
+		'options': 'Contact',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_name',
+		'fieldtype': 'Data',
+		'idx': 7,
+		'label': 'Name',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'address_display',
+		'fieldtype': 'Small Text',
+		'idx': 8,
+		'label': 'Address',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_display',
+		'fieldtype': 'Small Text',
+		'idx': 9,
+		'label': 'Contact',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_mobile',
+		'fieldtype': 'Text',
+		'idx': 10,
+		'label': 'Mobile No',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_email',
+		'fieldtype': 'Text',
+		'idx': 11,
+		'label': 'Contact Email',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'territory',
+		'fieldtype': 'Link',
+		'idx': 12,
+		'in_filter': 1,
+		'label': 'Territory',
+		'options': 'Territory',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'description': 'Category of customer as entered in Customer master',
+		'doctype': 'DocField',
+		'fieldname': 'customer_group',
+		'fieldtype': 'Link',
+		'idx': 13,
+		'in_filter': 1,
+		'label': 'Customer Group',
+		'options': 'Customer Group',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Purchase Order sent by customer',
+		'doctype': 'DocField',
+		'fieldname': 'po_no',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 14,
+		'label': 'P.O. No',
+		'oldfieldname': 'po_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'po_date',
+		'fieldtype': 'Date',
+		'hidden': 0,
+		'idx': 15,
+		'label': 'P.O. Date',
+		'oldfieldname': 'po_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 16,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'default': 'Today',
+		'description': 'The date at which current entry is made in system.',
+		'doctype': 'DocField',
+		'fieldname': 'transaction_date',
+		'fieldtype': 'Date',
+		'idx': 17,
+		'in_filter': 1,
+		'label': 'Sales Order Date',
+		'no_copy': 1,
+		'oldfieldname': 'transaction_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'width': '160px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'order_type',
+		'fieldtype': 'Select',
+		'idx': 18,
+		'label': 'Order Type',
+		'oldfieldname': 'order_type',
+		'oldfieldtype': 'Select',
+		'options': '\nSales\nMaintenance',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'default': 'Draft',
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Select',
+		'idx': 19,
+		'in_filter': 1,
+		'label': 'Status',
+		'no_copy': 1,
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Select',
+		'options': '\nDraft\nSubmitted\nStopped\nCancelled',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'delivery_date',
+		'fieldtype': 'Date',
+		'hidden': 0,
+		'idx': 20,
+		'in_filter': 1,
+		'label': 'Expected Delivery Date',
+		'oldfieldname': 'delivery_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0,
+		'search_index': 1,
+		'width': '160px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Track this Sales Order against any Project',
+		'doctype': 'DocField',
+		'fieldname': 'project_name',
+		'fieldtype': 'Link',
+		'idx': 21,
+		'in_filter': 1,
+		'label': 'Project Name',
+		'oldfieldname': 'project_name',
+		'oldfieldtype': 'Link',
+		'options': 'Project',
+		'permlevel': 0,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.__islocal',
+		'description': '% of materials delivered against this Sales Order',
+		'doctype': 'DocField',
+		'fieldname': 'per_delivered',
+		'fieldtype': 'Currency',
+		'idx': 22,
+		'in_filter': 1,
+		'label': '%  Delivered',
+		'no_copy': 1,
+		'oldfieldname': 'per_delivered',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.__islocal',
+		'description': '% of materials billed against this Sales Order',
+		'doctype': 'DocField',
+		'fieldname': 'per_billed',
+		'fieldtype': 'Currency',
+		'idx': 23,
+		'in_filter': 1,
+		'label': '% Qty Billed',
+		'no_copy': 1,
+		'oldfieldname': 'per_billed',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 24,
+		'label': 'Amended From',
+		'no_copy': 1,
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'The date at which current entry is corrected in the system.',
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'hidden': 1,
+		'idx': 25,
+		'label': 'Amendment Date',
+		'no_copy': 1,
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'shipping_address_name',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 26,
+		'in_filter': 1,
+		'label': 'Shipping Address Name',
+		'options': 'Address',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'shipping_address',
+		'fieldtype': 'Small Text',
+		'idx': 27,
+		'in_filter': 0,
+		'label': 'Shipping Address',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 28,
+		'label': 'Items',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Quotation no against which this Sales Order is made ',
+		'doctype': 'DocField',
+		'fieldname': 'quotation_no',
+		'fieldtype': 'Link',
+		'idx': 29,
+		'in_filter': 1,
+		'label': 'Quotation No',
+		'no_copy': 0,
+		'oldfieldname': 'quotation_no',
+		'oldfieldtype': 'Link',
+		'options': 'Quotation',
+		'permlevel': 0,
+		'print_hide': 1,
+		'search_index': 1,
+		'trigger': 'Client',
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'quotation_date',
+		'fieldtype': 'Date',
+		'hidden': 1,
+		'idx': 30,
+		'label': 'Quotation Date',
+		'no_copy': 0,
+		'oldfieldname': 'quotation_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 31,
+		'label': 'Pull Quotation Details',
+		'oldfieldtype': 'Button',
+		'options': 'pull_quotation_details',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Select the price list as entered in "Price List" master. This will pull the reference rates of items against this price list as specified in "Item" master.',
+		'doctype': 'DocField',
+		'fieldname': 'price_list_name',
+		'fieldtype': 'Select',
+		'idx': 32,
+		'label': 'Price List',
+		'oldfieldname': 'price_list_name',
+		'oldfieldtype': 'Select',
+		'options': 'link:Price List',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 33,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': "Customer's currency",
+		'doctype': 'DocField',
+		'fieldname': 'currency',
+		'fieldtype': 'Select',
+		'idx': 34,
+		'label': 'Currency',
+		'oldfieldname': 'currency',
+		'oldfieldtype': 'Select',
+		'options': 'link:Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': '1.00',
+		'description': "Rate at which customer's currency is converted to your currency",
+		'doctype': 'DocField',
+		'fieldname': 'conversion_rate',
+		'fieldtype': 'Currency',
+		'idx': 35,
+		'label': 'Conversion Rate',
+		'oldfieldname': 'conversion_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 36,
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'sales_order_details',
+		'fieldtype': 'Table',
+		'idx': 37,
+		'label': 'Sales Order Details',
+		'oldfieldname': 'sales_order_details',
+		'oldfieldtype': 'Table',
+		'options': 'Sales Order Detail',
+		'permlevel': 0,
+		'print_hide': 0,
+		'width': '40px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 38,
+		'label': 'Clear Table',
+		'oldfieldtype': 'Button',
+		'options': 'clear_sales_order_details',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 39,
+		'label': 'Re-Calculate Values',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'print_hide': 1,
+		'search_index': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'net_total',
+		'fieldtype': 'Currency',
+		'idx': 40,
+		'label': 'Net Total*',
+		'oldfieldname': 'net_total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 41,
+		'label': 'Note1',
+		'oldfieldtype': 'HTML',
+		'options': 'NOTE : * In Base Currency',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 42,
+		'label': 'Taxes',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'charge',
+		'fieldtype': 'Link',
+		'idx': 43,
+		'label': 'Select Charges Master',
+		'oldfieldname': 'charge',
+		'oldfieldtype': 'Link',
+		'options': 'Other Charges',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 44,
+		'label': 'Get Charges',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'other_charges',
+		'fieldtype': 'Table',
+		'idx': 45,
+		'label': 'Other Charges',
+		'oldfieldname': 'other_charges',
+		'oldfieldtype': 'Table',
+		'options': 'RV Tax Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 46,
+		'label': 'Calculate Charges',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'print_hide': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'other_charges_total',
+		'fieldtype': 'Currency',
+		'idx': 47,
+		'label': 'Charges Total*',
+		'oldfieldname': 'other_charges_total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'grand_total',
+		'fieldtype': 'Currency',
+		'idx': 48,
+		'label': 'Grand Total*',
+		'oldfieldname': 'grand_total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 49,
+		'label': 'OT Notes',
+		'oldfieldtype': 'HTML',
+		'options': 'NOTE : * In Base Currency',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 50,
+		'label': 'Other Charges Calculation',
+		'oldfieldtype': 'HTML',
+		'permlevel': 0,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 51,
+		'label': 'Totals',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rounded_total',
+		'fieldtype': 'Currency',
+		'idx': 52,
+		'label': 'Rounded Total',
+		'oldfieldname': 'rounded_total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'In Words will be visible once you save the Sales Order.',
+		'doctype': 'DocField',
+		'fieldname': 'in_words',
+		'fieldtype': 'Data',
+		'idx': 53,
+		'label': 'In Words',
+		'oldfieldname': 'in_words',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 54,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'print_hide': 1,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'grand_total_export',
+		'fieldtype': 'Currency',
+		'idx': 55,
+		'label': 'Grand Total (Export)',
+		'oldfieldname': 'grand_total_export',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rounded_total_export',
+		'fieldtype': 'Currency',
+		'idx': 56,
+		'label': 'Rounded Total (Export)',
+		'oldfieldname': 'rounded_total_export',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'In Words (Export) will be visible once you save the Sales Order.',
+		'doctype': 'DocField',
+		'fieldname': 'in_words_export',
+		'fieldtype': 'Data',
+		'idx': 57,
+		'label': 'In Words (Export)',
+		'oldfieldname': 'in_words_export',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 58,
+		'label': 'Terms',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tc_name',
+		'fieldtype': 'Link',
+		'idx': 59,
+		'label': 'Select Terms',
+		'oldfieldname': 'tc_name',
+		'oldfieldtype': 'Link',
+		'options': 'Term',
+		'permlevel': 0,
+		'print_hide': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 60,
+		'label': 'Get Terms',
+		'oldfieldtype': 'Button',
+		'options': 'get_tc_details',
+		'permlevel': 0,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 61,
+		'label': 'Terms HTML',
+		'oldfieldtype': 'HTML',
+		'options': 'You can add Terms and Notes that will be printed in the Transaction',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'terms',
+		'fieldtype': 'Text Editor',
+		'idx': 62,
+		'label': 'Term Details',
+		'oldfieldname': 'terms',
+		'oldfieldtype': 'Text Editor',
+		'permlevel': 0,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Filling in additional information about the Sales Order will help you analyze your data better.',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 63,
+		'label': 'More Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 64,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'print_hide': 1,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'letter_head',
+		'fieldtype': 'Select',
+		'idx': 65,
+		'label': 'Letter Head',
+		'oldfieldname': 'letter_head',
+		'oldfieldtype': 'Select',
+		'options': 'link:Letter Head',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Select the relevant company name if you have multiple companies.',
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 66,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client',
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 67,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'select_print_heading',
+		'fieldtype': 'Link',
+		'idx': 68,
+		'label': 'Select Print Heading',
+		'no_copy': 1,
+		'oldfieldname': 'select_print_heading',
+		'oldfieldtype': 'Link',
+		'options': 'Print Heading',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 69,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'print_hide': 1,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'source',
+		'fieldtype': 'Select',
+		'idx': 70,
+		'label': 'Source',
+		'oldfieldname': 'source',
+		'oldfieldtype': 'Select',
+		'options': "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': "eval:doc.source == 'Campaign'",
+		'doctype': 'DocField',
+		'fieldname': 'campaign',
+		'fieldtype': 'Link',
+		'idx': 71,
+		'label': 'Campaign',
+		'oldfieldname': 'campaign',
+		'oldfieldtype': 'Link',
+		'options': 'Campaign',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'note',
+		'fieldtype': 'Text',
+		'idx': 72,
+		'label': 'Note',
+		'oldfieldname': 'note',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.__islocal',
+		'doctype': 'DocField',
+		'fieldname': 'cancel_reason',
+		'fieldtype': 'Data',
+		'idx': 73,
+		'label': 'Cancel Reason',
+		'no_column': 0,
+		'no_copy': 1,
+		'oldfieldname': 'cancel_reason',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'delivery_status',
+		'fieldtype': 'Select',
+		'hidden': 1,
+		'idx': 74,
+		'label': 'Delivery Status',
+		'no_column': 0,
+		'no_copy': 1,
+		'options': 'Delivered\nNot Delivered\nPartly Delivered\nClosed\nNot Applicable',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'billing_status',
+		'fieldtype': 'Select',
+		'hidden': 1,
+		'idx': 75,
+		'label': 'Billing Status',
+		'no_column': 0,
+		'no_copy': 1,
+		'options': 'Billed\nNot Billed\nPartly Billed\nClosed',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Display all the individual items delivered with the main items',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'hidden': 0,
+		'idx': 76,
+		'label': 'Packing List',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'packing_details',
+		'fieldtype': 'Table',
+		'idx': 77,
+		'label': 'Packing Details',
+		'oldfieldname': 'packing_details',
+		'oldfieldtype': 'Table',
+		'options': 'Delivery Note Packing Detail',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 78,
+		'label': 'Sales Team',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Name as entered in Sales Partner master',
+		'doctype': 'DocField',
+		'fieldname': 'sales_partner',
+		'fieldtype': 'Link',
+		'idx': 79,
+		'in_filter': 1,
+		'label': 'Sales Partner',
+		'oldfieldname': 'sales_partner',
+		'oldfieldtype': 'Link',
+		'options': 'Sales Partner',
+		'permlevel': 0,
+		'print_hide': 1,
+		'search_index': 1,
+		'trigger': 'Client',
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'commission_rate',
+		'fieldtype': 'Currency',
+		'idx': 80,
+		'label': 'Commission Rate',
+		'oldfieldname': 'commission_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'total_commission',
+		'fieldtype': 'Currency',
+		'idx': 81,
+		'label': 'Total Commission',
+		'oldfieldname': 'total_commission',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sales_team',
+		'fieldtype': 'Table',
+		'idx': 82,
+		'label': 'Sales Team1',
+		'oldfieldname': 'sales_team',
+		'oldfieldtype': 'Table',
+		'options': 'Sales Team',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 83,
+		'label': 'Repair Sales Order',
+		'oldfieldtype': 'Button',
+		'options': 'repair_sales_order',
+		'permlevel': 0,
+		'print_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/material_management/doctype/delivery_note/__init__.py b/selling/doctype/sales_order_detail/__init__.py
similarity index 100%
rename from material_management/doctype/delivery_note/__init__.py
rename to selling/doctype/sales_order_detail/__init__.py
diff --git a/selling/doctype/sales_order_detail/sales_order_detail.txt b/selling/doctype/sales_order_detail/sales_order_detail.txt
new file mode 100644
index 0000000000..e89768c6ec
--- /dev/null
+++ b/selling/doctype/sales_order_detail/sales_order_detail.txt
@@ -0,0 +1,515 @@
+# DocType, Sales Order Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:22',
+		'docstatus': 0,
+		'modified': '2011-04-12 14:08:58',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'SOD/.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Selling',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 52
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Sales Order Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Sales Order Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Sales Order Detail'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 0,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'in_filter': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client',
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Item Name',
+		'oldfieldname': 'item_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'width': '150'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Small Text',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'qty',
+		'fieldtype': 'Currency',
+		'idx': 4,
+		'label': 'Quantity',
+		'oldfieldname': 'qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_uom',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 5,
+		'label': 'UOM',
+		'oldfieldname': 'stock_uom',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'reqd': 0,
+		'width': '70px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'ref_rate',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'label': 'Ref Rate',
+		'oldfieldname': 'ref_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0,
+		'trigger': 'Client',
+		'width': '70px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'adj_rate',
+		'fieldtype': 'Float',
+		'idx': 7,
+		'label': 'Discount(%)',
+		'oldfieldname': 'adj_rate',
+		'oldfieldtype': 'Float',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client',
+		'width': '70px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'export_rate',
+		'fieldtype': 'Currency',
+		'idx': 8,
+		'label': 'Rate',
+		'oldfieldname': 'export_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 0,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'export_amount',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'label': 'Amount',
+		'no_copy': 0,
+		'oldfieldname': 'export_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'reqd': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'base_ref_rate',
+		'fieldtype': 'Currency',
+		'idx': 10,
+		'label': 'Ref Rate*',
+		'oldfieldname': 'base_ref_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'basic_rate',
+		'fieldtype': 'Currency',
+		'idx': 11,
+		'label': 'Basic Rate*',
+		'oldfieldname': 'basic_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'amount',
+		'fieldtype': 'Currency',
+		'idx': 12,
+		'label': 'Amount*',
+		'no_copy': 0,
+		'oldfieldname': 'amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reserved_warehouse',
+		'fieldtype': 'Link',
+		'idx': 13,
+		'label': 'Reserved Warehouse',
+		'no_copy': 1,
+		'oldfieldname': 'reserved_warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0,
+		'trigger': 'Client',
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'projected_qty',
+		'fieldtype': 'Currency',
+		'idx': 14,
+		'label': 'Projected Qty',
+		'no_copy': 1,
+		'oldfieldname': 'projected_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '70px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'actual_qty',
+		'fieldtype': 'Currency',
+		'idx': 15,
+		'label': 'Actual Qty',
+		'no_copy': 1,
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '70px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'indented_qty',
+		'fieldtype': 'Currency',
+		'idx': 16,
+		'label': 'Indented Qty',
+		'no_copy': 1,
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '70px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'delivered_qty',
+		'fieldtype': 'Currency',
+		'hidden': 0,
+		'idx': 17,
+		'in_filter': 0,
+		'label': 'Delivered Qty',
+		'no_copy': 1,
+		'oldfieldname': 'delivered_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'billed_qty',
+		'fieldtype': 'Currency',
+		'idx': 18,
+		'in_filter': 0,
+		'label': 'Billed Qty',
+		'no_copy': 1,
+		'oldfieldname': 'billed_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'billed_amt',
+		'fieldtype': 'Currency',
+		'idx': 19,
+		'label': 'Billed Amt',
+		'no_copy': 1,
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'description': 'For Production',
+		'doctype': 'DocField',
+		'fieldname': 'planned_qty',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 20,
+		'label': 'Planned Quantity',
+		'no_copy': 1,
+		'oldfieldname': 'planned_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 1,
+		'width': '50px'
+	},
+
+	# DocField
+	{
+		'description': 'For Production',
+		'doctype': 'DocField',
+		'fieldname': 'produced_qty',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 21,
+		'label': 'Produced Quantity',
+		'oldfieldname': 'produced_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 1,
+		'width': '50px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'brand',
+		'fieldtype': 'Link',
+		'idx': 22,
+		'in_filter': 1,
+		'label': 'Brand Name',
+		'oldfieldname': 'brand',
+		'oldfieldtype': 'Link',
+		'options': 'Brand',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_group',
+		'fieldtype': 'Link',
+		'idx': 23,
+		'in_filter': 1,
+		'label': 'Item Group',
+		'oldfieldname': 'item_group',
+		'oldfieldtype': 'Link',
+		'options': 'Item Group',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_docname',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 24,
+		'in_filter': 1,
+		'label': 'Quotation No.',
+		'oldfieldname': 'prevdoc_docname',
+		'oldfieldtype': 'Link',
+		'options': 'Quotation',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'page_break',
+		'fieldtype': 'Check',
+		'idx': 25,
+		'label': 'Page Break',
+		'oldfieldname': 'page_break',
+		'oldfieldtype': 'Check',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'description': 'required for production. will be used later.',
+		'doctype': 'DocField',
+		'fieldname': 'delivery_date',
+		'fieldtype': 'Date',
+		'hidden': 0,
+		'idx': 26,
+		'label': 'Expected Delivery Date',
+		'oldfieldname': 'delivery_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'description': 'required for production. will be used later.',
+		'doctype': 'DocField',
+		'fieldname': 'confirmation_date',
+		'fieldtype': 'Date',
+		'hidden': 0,
+		'idx': 27,
+		'in_filter': 1,
+		'label': 'Confirmed Delivery Date',
+		'oldfieldname': 'confirmation_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_tax_rate',
+		'fieldtype': 'Small Text',
+		'hidden': 1,
+		'idx': 28,
+		'label': 'Item Tax Rate',
+		'oldfieldname': 'item_tax_rate',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'description': 'The date at which current entry is made in system.',
+		'doctype': 'DocField',
+		'fieldname': 'transaction_date',
+		'fieldtype': 'Date',
+		'hidden': 1,
+		'idx': 29,
+		'in_filter': 0,
+		'label': 'Sales Order Date',
+		'oldfieldname': 'transaction_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 1,
+		'search_index': 0
+	}
+]
\ No newline at end of file
diff --git a/material_management/doctype/delivery_note_detail/__init__.py b/selling/doctype/sales_team/__init__.py
similarity index 100%
rename from material_management/doctype/delivery_note_detail/__init__.py
rename to selling/doctype/sales_team/__init__.py
diff --git a/selling/doctype/sales_team/sales_team.txt b/selling/doctype/sales_team/sales_team.txt
new file mode 100644
index 0000000000..9f3c50d585
--- /dev/null
+++ b/selling/doctype/sales_team/sales_team.txt
@@ -0,0 +1,135 @@
+# DocType, Sales Team
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:23',
+		'docstatus': 0,
+		'modified': '2010-11-24 09:09:57',
+		'modified_by': 'nabin@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Selling',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 5
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Sales Team',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Sales Team
+	{
+		'doctype': 'DocType',
+		'name': 'Sales Team'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sales_person',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'in_filter': 1,
+		'label': 'Sales Person',
+		'oldfieldname': 'sales_person',
+		'oldfieldtype': 'Link',
+		'options': 'Sales Person',
+		'reqd': 1,
+		'search_index': 1,
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sales_designation',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Designation',
+		'oldfieldname': 'sales_designation',
+		'oldfieldtype': 'Data',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_no',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 3,
+		'label': 'Contact No.',
+		'oldfieldname': 'contact_no',
+		'oldfieldtype': 'Data',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'allocated_percentage',
+		'fieldtype': 'Currency',
+		'idx': 4,
+		'label': 'Allocated (%)',
+		'oldfieldname': 'allocated_percentage',
+		'oldfieldtype': 'Currency',
+		'reqd': 0,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'allocated_amount',
+		'fieldtype': 'Currency',
+		'idx': 5,
+		'label': 'Allocated Amount',
+		'oldfieldname': 'allocated_amount',
+		'oldfieldtype': 'Currency',
+		'reqd': 0,
+		'width': '120px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'parenttype',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Parenttype',
+		'oldfieldname': 'parenttype',
+		'oldfieldtype': 'Data',
+		'print_hide': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'incentives',
+		'fieldtype': 'Currency',
+		'idx': 7,
+		'label': 'Incentives',
+		'oldfieldname': 'incentives',
+		'oldfieldtype': 'Currency'
+	}
+]
\ No newline at end of file
diff --git a/material_management/doctype/delivery_note_packing_detail/__init__.py b/selling/doctype/shipping_address/__init__.py
old mode 100644
new mode 100755
similarity index 100%
rename from material_management/doctype/delivery_note_packing_detail/__init__.py
rename to selling/doctype/shipping_address/__init__.py
diff --git a/crm/doctype/shipping_address/shipping_address.js b/selling/doctype/shipping_address/shipping_address.js
similarity index 100%
rename from crm/doctype/shipping_address/shipping_address.js
rename to selling/doctype/shipping_address/shipping_address.js
diff --git a/crm/doctype/shipping_address/shipping_address.py b/selling/doctype/shipping_address/shipping_address.py
similarity index 100%
rename from crm/doctype/shipping_address/shipping_address.py
rename to selling/doctype/shipping_address/shipping_address.py
diff --git a/selling/doctype/shipping_address/shipping_address.txt b/selling/doctype/shipping_address/shipping_address.txt
new file mode 100755
index 0000000000..b1016168d8
--- /dev/null
+++ b/selling/doctype/shipping_address/shipping_address.txt
@@ -0,0 +1,193 @@
+# DocType, Shipping Address
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2011-03-23 10:39:45',
+		'docstatus': 0,
+		'modified': '2011-03-24 10:39:09',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'SA.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Selling',
+		'name': '__common__',
+		'search_fields': 'customer, ship_to, shipping_address',
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'version': 8
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Shipping Address',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Shipping Address',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Shipping Address
+	{
+		'doctype': 'DocType',
+		'name': 'Shipping Address'
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'Sales Master Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'Sales Master Manager'
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'Sales Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'Sales Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 1,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer',
+		'fieldtype': 'Link',
+		'idx': 2,
+		'label': 'Customer',
+		'options': 'Customer',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_name',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Customer Name',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_address',
+		'fieldtype': 'Text',
+		'idx': 4,
+		'label': 'Customer Address',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'ship_to',
+		'fieldtype': 'Data',
+		'idx': 5,
+		'label': 'Ship To',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'shipping_address',
+		'fieldtype': 'Text',
+		'idx': 6,
+		'label': 'Shipping Address',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 7,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_primary_address',
+		'fieldtype': 'Select',
+		'idx': 8,
+		'label': 'Is Primary Address',
+		'options': 'Yes\nNo',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'shipping_details',
+		'fieldtype': 'Text Editor',
+		'idx': 9,
+		'label': 'Shipping Details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 10,
+		'label': 'Trash Reason',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/material_management/doctype/item/__init__.py b/selling/doctype/sms_center/__init__.py
similarity index 100%
rename from material_management/doctype/item/__init__.py
rename to selling/doctype/sms_center/__init__.py
diff --git a/material_management/doctype/item_attachments_detail/__init__.py b/selling/doctype/sms_center/sms_center.js
similarity index 100%
rename from material_management/doctype/item_attachments_detail/__init__.py
rename to selling/doctype/sms_center/sms_center.js
diff --git a/crm/doctype/sms_center/sms_center.py b/selling/doctype/sms_center/sms_center.py
similarity index 100%
rename from crm/doctype/sms_center/sms_center.py
rename to selling/doctype/sms_center/sms_center.py
diff --git a/selling/doctype/sms_center/sms_center.txt b/selling/doctype/sms_center/sms_center.txt
new file mode 100644
index 0000000000..507f1601ea
--- /dev/null
+++ b/selling/doctype/sms_center/sms_center.txt
@@ -0,0 +1,195 @@
+# DocType, SMS Center
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2011-01-11 17:52:26',
+		'docstatus': 0,
+		'modified': '2011-02-15 17:06:33',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1300788634',
+		'allow_attach': 0,
+		'allow_copy': 1,
+		'allow_email': 1,
+		'allow_print': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'hide_heading': 0,
+		'hide_toolbar': 0,
+		'in_create': 0,
+		'issingle': 1,
+		'menu_index': 4,
+		'module': 'Selling',
+		'name': '__common__',
+		'read_only': 1,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 1,
+		'version': 39
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'SMS Center',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'SMS Center',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'role': 'System Manager'
+	},
+
+	# DocType, SMS Center
+	{
+		'doctype': 'DocType',
+		'name': 'SMS Center'
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'write': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'column_break1',
+		'fieldtype': 'Column Break',
+		'idx': 1,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'send_to',
+		'fieldtype': 'Select',
+		'idx': 2,
+		'label': 'Send To',
+		'options': '\nAll Contact\nAll Customer Contact\nAll Supplier Contact\nAll Sales Partner Contact\nAll Lead (Open)\nAll Employee (Active)\nAll Sales Person',
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': "eval:doc.send_to=='All Customer Contact'",
+		'doctype': 'DocField',
+		'fieldname': 'customer',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'label': 'Customer',
+		'options': 'Customer'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': "eval:doc.send_to=='All Supplier Contact'",
+		'doctype': 'DocField',
+		'fieldname': 'supplier',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'label': 'Supplier',
+		'options': 'Supplier'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': "eval:doc.send_to=='All Employee (Active)'",
+		'doctype': 'DocField',
+		'fieldname': 'department',
+		'fieldtype': 'Select',
+		'idx': 5,
+		'label': 'Department',
+		'options': 'link:Department'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': "eval:doc.send_to=='All Employee (Active)'",
+		'doctype': 'DocField',
+		'fieldname': 'branch',
+		'fieldtype': 'Select',
+		'idx': 6,
+		'label': 'Branch',
+		'options': 'link:Branch'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 7,
+		'label': 'Create Receiver List',
+		'options': 'create_receiver_list'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'receiver_list',
+		'fieldtype': 'Code',
+		'idx': 8,
+		'label': 'Receiver List'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'column_break9',
+		'fieldtype': 'Column Break',
+		'idx': 9,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'description': 'Message greater than 160 character will be splitted into multiple mesage',
+		'doctype': 'DocField',
+		'fieldname': 'message',
+		'fieldtype': 'Text',
+		'idx': 10,
+		'label': 'Message',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 11,
+		'label': 'Send SMS',
+		'options': 'send_sms'
+	}
+]
\ No newline at end of file
diff --git a/material_management/doctype/item_specification_detail/__init__.py b/selling/page/__init__.py
similarity index 100%
rename from material_management/doctype/item_specification_detail/__init__.py
rename to selling/page/__init__.py
diff --git a/material_management/doctype/item_tax/__init__.py b/selling/page/customers/__init__.py
similarity index 100%
rename from material_management/doctype/item_tax/__init__.py
rename to selling/page/customers/__init__.py
diff --git a/crm/page/customers/customers.html b/selling/page/customers/customers.html
similarity index 100%
rename from crm/page/customers/customers.html
rename to selling/page/customers/customers.html
diff --git a/crm/page/customers/customers.js b/selling/page/customers/customers.js
similarity index 100%
rename from crm/page/customers/customers.js
rename to selling/page/customers/customers.js
diff --git a/crm/page/customers/customers.txt b/selling/page/customers/customers.txt
similarity index 100%
rename from crm/page/customers/customers.txt
rename to selling/page/customers/customers.txt
diff --git a/material_management/doctype/landed_cost_master/__init__.py b/selling/page/sales_browser/__init__.py
similarity index 100%
rename from material_management/doctype/landed_cost_master/__init__.py
rename to selling/page/sales_browser/__init__.py
diff --git a/crm/page/sales_browser/sales_browser.html b/selling/page/sales_browser/sales_browser.html
similarity index 100%
rename from crm/page/sales_browser/sales_browser.html
rename to selling/page/sales_browser/sales_browser.html
diff --git a/crm/page/sales_browser/sales_browser.js b/selling/page/sales_browser/sales_browser.js
similarity index 100%
rename from crm/page/sales_browser/sales_browser.js
rename to selling/page/sales_browser/sales_browser.js
diff --git a/selling/page/sales_browser/sales_browser.txt b/selling/page/sales_browser/sales_browser.txt
new file mode 100644
index 0000000000..d6dfbf351b
--- /dev/null
+++ b/selling/page/sales_browser/sales_browser.txt
@@ -0,0 +1,51 @@
+# Page, Sales Browser
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-12-14 10:23:21',
+		'docstatus': 0,
+		'modified': '2010-12-24 11:56:34',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
+		'module': 'Selling',
+		'name': '__common__',
+		'page_name': 'Sales Browser',
+		'show_in_menu': 0,
+		'standard': 'Yes'
+	},
+
+	# These values are common for all Page Role
+	{
+		'doctype': 'Page Role',
+		'name': '__common__',
+		'parent': 'Sales Browser',
+		'parentfield': 'roles',
+		'parenttype': 'Page'
+	},
+
+	# Page, Sales Browser
+	{
+		'doctype': 'Page',
+		'name': 'Sales Browser'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 1,
+		'role': 'Sales Master Manager'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 2,
+		'role': 'Material Master Manager'
+	}
+]
\ No newline at end of file
diff --git a/material_management/doctype/landed_cost_master_detail/__init__.py b/selling/page/sales_dashboard/__init__.py
similarity index 100%
rename from material_management/doctype/landed_cost_master_detail/__init__.py
rename to selling/page/sales_dashboard/__init__.py
diff --git a/crm/page/sales_dashboard/sales_dashboard.html b/selling/page/sales_dashboard/sales_dashboard.html
similarity index 100%
rename from crm/page/sales_dashboard/sales_dashboard.html
rename to selling/page/sales_dashboard/sales_dashboard.html
diff --git a/crm/page/sales_dashboard/sales_dashboard.js b/selling/page/sales_dashboard/sales_dashboard.js
similarity index 100%
rename from crm/page/sales_dashboard/sales_dashboard.js
rename to selling/page/sales_dashboard/sales_dashboard.js
diff --git a/selling/page/sales_dashboard/sales_dashboard.txt b/selling/page/sales_dashboard/sales_dashboard.txt
new file mode 100644
index 0000000000..1e80e2c254
--- /dev/null
+++ b/selling/page/sales_dashboard/sales_dashboard.txt
@@ -0,0 +1,44 @@
+# Page, Sales Dashboard
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-10-12 15:19:32',
+		'docstatus': 0,
+		'modified': '2010-09-25 00:00:00',
+		'modified_by': 'Administrator',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
+		'module': 'Selling',
+		'name': '__common__',
+		'page_name': 'Sales Dashboard',
+		'show_in_menu': 0,
+		'standard': 'Yes'
+	},
+
+	# These values are common for all Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'Sales Dashboard',
+		'parentfield': 'roles',
+		'parenttype': 'Page',
+		'role': 'Sales Manager'
+	},
+
+	# Page, Sales Dashboard
+	{
+		'doctype': 'Page',
+		'name': 'Sales Dashboard'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role'
+	}
+]
\ No newline at end of file
diff --git a/material_management/doctype/landed_cost_wizard/__init__.py b/selling/search_criteria/__init__.py
similarity index 100%
rename from material_management/doctype/landed_cost_wizard/__init__.py
rename to selling/search_criteria/__init__.py
diff --git a/material_management/doctype/purchase_receipt/__init__.py b/selling/search_criteria/delivered_items_to_be_install/__init__.py
similarity index 100%
rename from material_management/doctype/purchase_receipt/__init__.py
rename to selling/search_criteria/delivered_items_to_be_install/__init__.py
diff --git a/crm/search_criteria/delivered_items_to_be_install/delivered_items_to_be_install.js b/selling/search_criteria/delivered_items_to_be_install/delivered_items_to_be_install.js
similarity index 100%
rename from crm/search_criteria/delivered_items_to_be_install/delivered_items_to_be_install.js
rename to selling/search_criteria/delivered_items_to_be_install/delivered_items_to_be_install.js
diff --git a/crm/search_criteria/delivered_items_to_be_install/delivered_items_to_be_install.txt b/selling/search_criteria/delivered_items_to_be_install/delivered_items_to_be_install.txt
similarity index 100%
rename from crm/search_criteria/delivered_items_to_be_install/delivered_items_to_be_install.txt
rename to selling/search_criteria/delivered_items_to_be_install/delivered_items_to_be_install.txt
diff --git a/material_management/doctype/purchase_receipt_detail/__init__.py b/selling/search_criteria/delivery_note_itemwise_pending_to_bill/__init__.py
similarity index 100%
rename from material_management/doctype/purchase_receipt_detail/__init__.py
rename to selling/search_criteria/delivery_note_itemwise_pending_to_bill/__init__.py
diff --git a/crm/search_criteria/delivery_note_itemwise_pending_to_bill/delivery_note_itemwise_pending_to_bill.txt b/selling/search_criteria/delivery_note_itemwise_pending_to_bill/delivery_note_itemwise_pending_to_bill.txt
similarity index 100%
rename from crm/search_criteria/delivery_note_itemwise_pending_to_bill/delivery_note_itemwise_pending_to_bill.txt
rename to selling/search_criteria/delivery_note_itemwise_pending_to_bill/delivery_note_itemwise_pending_to_bill.txt
diff --git a/material_management/doctype/ref_rate_detail/__init__.py b/selling/search_criteria/draft_sales_orders/__init__.py
similarity index 100%
rename from material_management/doctype/ref_rate_detail/__init__.py
rename to selling/search_criteria/draft_sales_orders/__init__.py
diff --git a/crm/search_criteria/draft_sales_orders/draft_sales_orders.js b/selling/search_criteria/draft_sales_orders/draft_sales_orders.js
similarity index 100%
rename from crm/search_criteria/draft_sales_orders/draft_sales_orders.js
rename to selling/search_criteria/draft_sales_orders/draft_sales_orders.js
diff --git a/crm/search_criteria/draft_sales_orders/draft_sales_orders.txt b/selling/search_criteria/draft_sales_orders/draft_sales_orders.txt
similarity index 100%
rename from crm/search_criteria/draft_sales_orders/draft_sales_orders.txt
rename to selling/search_criteria/draft_sales_orders/draft_sales_orders.txt
diff --git a/material_management/doctype/sales_and_purchase_return_wizard/__init__.py b/selling/search_criteria/follow_up_report/__init__.py
similarity index 100%
rename from material_management/doctype/sales_and_purchase_return_wizard/__init__.py
rename to selling/search_criteria/follow_up_report/__init__.py
diff --git a/crm/search_criteria/follow_up_report/follow_up_report.js b/selling/search_criteria/follow_up_report/follow_up_report.js
similarity index 100%
rename from crm/search_criteria/follow_up_report/follow_up_report.js
rename to selling/search_criteria/follow_up_report/follow_up_report.js
diff --git a/crm/search_criteria/follow_up_report/follow_up_report.py b/selling/search_criteria/follow_up_report/follow_up_report.py
similarity index 100%
rename from crm/search_criteria/follow_up_report/follow_up_report.py
rename to selling/search_criteria/follow_up_report/follow_up_report.py
diff --git a/crm/search_criteria/follow_up_report/follow_up_report.txt b/selling/search_criteria/follow_up_report/follow_up_report.txt
similarity index 100%
rename from crm/search_criteria/follow_up_report/follow_up_report.txt
rename to selling/search_criteria/follow_up_report/follow_up_report.txt
diff --git a/material_management/doctype/sales_bom/__init__.py b/selling/search_criteria/gross_profit/__init__.py
similarity index 100%
rename from material_management/doctype/sales_bom/__init__.py
rename to selling/search_criteria/gross_profit/__init__.py
diff --git a/crm/search_criteria/gross_profit/gross_profit.js b/selling/search_criteria/gross_profit/gross_profit.js
similarity index 100%
rename from crm/search_criteria/gross_profit/gross_profit.js
rename to selling/search_criteria/gross_profit/gross_profit.js
diff --git a/crm/search_criteria/gross_profit/gross_profit.py b/selling/search_criteria/gross_profit/gross_profit.py
similarity index 100%
rename from crm/search_criteria/gross_profit/gross_profit.py
rename to selling/search_criteria/gross_profit/gross_profit.py
diff --git a/crm/search_criteria/gross_profit/gross_profit.txt b/selling/search_criteria/gross_profit/gross_profit.txt
similarity index 100%
rename from crm/search_criteria/gross_profit/gross_profit.txt
rename to selling/search_criteria/gross_profit/gross_profit.txt
diff --git a/material_management/doctype/sales_bom_detail/__init__.py b/selling/search_criteria/itemwise_delivery_details/__init__.py
similarity index 100%
rename from material_management/doctype/sales_bom_detail/__init__.py
rename to selling/search_criteria/itemwise_delivery_details/__init__.py
diff --git a/crm/search_criteria/itemwise_delivery_details/itemwise_delivery_details.js b/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.js
similarity index 100%
rename from crm/search_criteria/itemwise_delivery_details/itemwise_delivery_details.js
rename to selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.js
diff --git a/crm/search_criteria/itemwise_delivery_details/itemwise_delivery_details.py b/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.py
similarity index 100%
rename from crm/search_criteria/itemwise_delivery_details/itemwise_delivery_details.py
rename to selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.py
diff --git a/crm/search_criteria/itemwise_delivery_details/itemwise_delivery_details.txt b/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.txt
similarity index 100%
rename from crm/search_criteria/itemwise_delivery_details/itemwise_delivery_details.txt
rename to selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.txt
diff --git a/material_management/doctype/serial_no/__init__.py b/selling/search_criteria/itemwise_sales_details/__init__.py
similarity index 100%
rename from material_management/doctype/serial_no/__init__.py
rename to selling/search_criteria/itemwise_sales_details/__init__.py
diff --git a/crm/search_criteria/itemwise_sales_details/itemwise_sales_details.js b/selling/search_criteria/itemwise_sales_details/itemwise_sales_details.js
similarity index 100%
rename from crm/search_criteria/itemwise_sales_details/itemwise_sales_details.js
rename to selling/search_criteria/itemwise_sales_details/itemwise_sales_details.js
diff --git a/crm/search_criteria/itemwise_sales_details/itemwise_sales_details.py b/selling/search_criteria/itemwise_sales_details/itemwise_sales_details.py
similarity index 100%
rename from crm/search_criteria/itemwise_sales_details/itemwise_sales_details.py
rename to selling/search_criteria/itemwise_sales_details/itemwise_sales_details.py
diff --git a/crm/search_criteria/itemwise_sales_details/itemwise_sales_details.txt b/selling/search_criteria/itemwise_sales_details/itemwise_sales_details.txt
similarity index 100%
rename from crm/search_criteria/itemwise_sales_details/itemwise_sales_details.txt
rename to selling/search_criteria/itemwise_sales_details/itemwise_sales_details.txt
diff --git a/material_management/doctype/stock_entry/__init__.py b/selling/search_criteria/monthly_despatched_trend/__init__.py
similarity index 100%
rename from material_management/doctype/stock_entry/__init__.py
rename to selling/search_criteria/monthly_despatched_trend/__init__.py
diff --git a/crm/search_criteria/monthly_despatched_trend/monthly_despatched_trend.js b/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.js
similarity index 100%
rename from crm/search_criteria/monthly_despatched_trend/monthly_despatched_trend.js
rename to selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.js
diff --git a/crm/search_criteria/monthly_despatched_trend/monthly_despatched_trend.py b/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.py
similarity index 100%
rename from crm/search_criteria/monthly_despatched_trend/monthly_despatched_trend.py
rename to selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.py
diff --git a/crm/search_criteria/monthly_despatched_trend/monthly_despatched_trend.txt b/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.txt
similarity index 100%
rename from crm/search_criteria/monthly_despatched_trend/monthly_despatched_trend.txt
rename to selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.txt
diff --git a/material_management/doctype/stock_entry_detail/__init__.py b/selling/search_criteria/periodic_sales_summary/__init__.py
similarity index 100%
rename from material_management/doctype/stock_entry_detail/__init__.py
rename to selling/search_criteria/periodic_sales_summary/__init__.py
diff --git a/crm/search_criteria/periodic_sales_summary/periodic_sales_summary.js b/selling/search_criteria/periodic_sales_summary/periodic_sales_summary.js
similarity index 100%
rename from crm/search_criteria/periodic_sales_summary/periodic_sales_summary.js
rename to selling/search_criteria/periodic_sales_summary/periodic_sales_summary.js
diff --git a/crm/search_criteria/periodic_sales_summary/periodic_sales_summary.txt b/selling/search_criteria/periodic_sales_summary/periodic_sales_summary.txt
similarity index 100%
rename from crm/search_criteria/periodic_sales_summary/periodic_sales_summary.txt
rename to selling/search_criteria/periodic_sales_summary/periodic_sales_summary.txt
diff --git a/material_management/doctype/stock_ledger/__init__.py b/selling/search_criteria/sales_agentwise_commission/__init__.py
similarity index 100%
rename from material_management/doctype/stock_ledger/__init__.py
rename to selling/search_criteria/sales_agentwise_commission/__init__.py
diff --git a/crm/search_criteria/sales_agentwise_commission/sales_agentwise_commission.js b/selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.js
similarity index 100%
rename from crm/search_criteria/sales_agentwise_commission/sales_agentwise_commission.js
rename to selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.js
diff --git a/crm/search_criteria/sales_agentwise_commission/sales_agentwise_commission.py b/selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.py
similarity index 100%
rename from crm/search_criteria/sales_agentwise_commission/sales_agentwise_commission.py
rename to selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.py
diff --git a/crm/search_criteria/sales_agentwise_commission/sales_agentwise_commission.txt b/selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.txt
similarity index 100%
rename from crm/search_criteria/sales_agentwise_commission/sales_agentwise_commission.txt
rename to selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.txt
diff --git a/material_management/doctype/stock_ledger_entry/__init__.py b/selling/search_criteria/sales_order_pending_items1/__init__.py
similarity index 100%
rename from material_management/doctype/stock_ledger_entry/__init__.py
rename to selling/search_criteria/sales_order_pending_items1/__init__.py
diff --git a/crm/search_criteria/sales_order_pending_items1/sales_order_pending_items1.js b/selling/search_criteria/sales_order_pending_items1/sales_order_pending_items1.js
similarity index 100%
rename from crm/search_criteria/sales_order_pending_items1/sales_order_pending_items1.js
rename to selling/search_criteria/sales_order_pending_items1/sales_order_pending_items1.js
diff --git a/crm/search_criteria/sales_order_pending_items1/sales_order_pending_items1.txt b/selling/search_criteria/sales_order_pending_items1/sales_order_pending_items1.txt
similarity index 100%
rename from crm/search_criteria/sales_order_pending_items1/sales_order_pending_items1.txt
rename to selling/search_criteria/sales_order_pending_items1/sales_order_pending_items1.txt
diff --git a/crm/search_criteria/sales_orderwise_booking_ b/selling/search_criteria/sales_orderwise_booking_
similarity index 100%
rename from crm/search_criteria/sales_orderwise_booking_
rename to selling/search_criteria/sales_orderwise_booking_
diff --git a/material_management/doctype/stock_reconciliation/__init__.py b/selling/search_criteria/sales_orderwise_booking_&_delivery_summary/__init__.py
similarity index 100%
rename from material_management/doctype/stock_reconciliation/__init__.py
rename to selling/search_criteria/sales_orderwise_booking_&_delivery_summary/__init__.py
diff --git a/crm/search_criteria/sales_orderwise_booking_&_delivery_summary/sales_orderwise_booking_&_delivery_summary.txt b/selling/search_criteria/sales_orderwise_booking_&_delivery_summary/sales_orderwise_booking_&_delivery_summary.txt
similarity index 100%
rename from crm/search_criteria/sales_orderwise_booking_&_delivery_summary/sales_orderwise_booking_&_delivery_summary.txt
rename to selling/search_criteria/sales_orderwise_booking_&_delivery_summary/sales_orderwise_booking_&_delivery_summary.txt
diff --git a/material_management/doctype/stock_uom_replace_utility/__init__.py b/selling/search_criteria/sales_orderwise_pending_amount_to_bill/__init__.py
similarity index 100%
rename from material_management/doctype/stock_uom_replace_utility/__init__.py
rename to selling/search_criteria/sales_orderwise_pending_amount_to_bill/__init__.py
diff --git a/crm/search_criteria/sales_orderwise_pending_amount_to_bill/sales_orderwise_pending_amount_to_bill.js b/selling/search_criteria/sales_orderwise_pending_amount_to_bill/sales_orderwise_pending_amount_to_bill.js
similarity index 100%
rename from crm/search_criteria/sales_orderwise_pending_amount_to_bill/sales_orderwise_pending_amount_to_bill.js
rename to selling/search_criteria/sales_orderwise_pending_amount_to_bill/sales_orderwise_pending_amount_to_bill.js
diff --git a/crm/search_criteria/sales_orderwise_pending_amount_to_bill/sales_orderwise_pending_amount_to_bill.txt b/selling/search_criteria/sales_orderwise_pending_amount_to_bill/sales_orderwise_pending_amount_to_bill.txt
similarity index 100%
rename from crm/search_criteria/sales_orderwise_pending_amount_to_bill/sales_orderwise_pending_amount_to_bill.txt
rename to selling/search_criteria/sales_orderwise_pending_amount_to_bill/sales_orderwise_pending_amount_to_bill.txt
diff --git a/material_management/doctype/uom_conversion_detail/__init__.py b/selling/search_criteria/sales_orderwise_pending_qty_to_deliver/__init__.py
similarity index 100%
rename from material_management/doctype/uom_conversion_detail/__init__.py
rename to selling/search_criteria/sales_orderwise_pending_qty_to_deliver/__init__.py
diff --git a/crm/search_criteria/sales_orderwise_pending_qty_to_deliver/sales_orderwise_pending_qty_to_deliver.txt b/selling/search_criteria/sales_orderwise_pending_qty_to_deliver/sales_orderwise_pending_qty_to_deliver.txt
similarity index 100%
rename from crm/search_criteria/sales_orderwise_pending_qty_to_deliver/sales_orderwise_pending_qty_to_deliver.txt
rename to selling/search_criteria/sales_orderwise_pending_qty_to_deliver/sales_orderwise_pending_qty_to_deliver.txt
diff --git a/material_management/doctype/valuation_control/__init__.py b/selling/search_criteria/sales_persons_target_variance_item_group_wise/__init__.py
similarity index 100%
rename from material_management/doctype/valuation_control/__init__.py
rename to selling/search_criteria/sales_persons_target_variance_item_group_wise/__init__.py
diff --git a/crm/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.js b/selling/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.js
similarity index 100%
rename from crm/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.js
rename to selling/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.js
diff --git a/crm/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.py b/selling/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.py
similarity index 100%
rename from crm/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.py
rename to selling/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.py
diff --git a/crm/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.txt b/selling/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.txt
similarity index 100%
rename from crm/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.txt
rename to selling/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.txt
diff --git a/material_management/doctype/warehouse/__init__.py b/selling/search_criteria/sales_personwise_transaction_summary/__init__.py
old mode 100644
new mode 100755
similarity index 100%
rename from material_management/doctype/warehouse/__init__.py
rename to selling/search_criteria/sales_personwise_transaction_summary/__init__.py
diff --git a/crm/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.js b/selling/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.js
similarity index 100%
rename from crm/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.js
rename to selling/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.js
diff --git a/crm/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.py b/selling/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.py
similarity index 100%
rename from crm/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.py
rename to selling/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.py
diff --git a/crm/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.txt b/selling/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.txt
similarity index 100%
rename from crm/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.txt
rename to selling/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.txt
diff --git a/material_management/page/__init__.py b/selling/search_criteria/target_variance_report/__init__.py
similarity index 100%
rename from material_management/page/__init__.py
rename to selling/search_criteria/target_variance_report/__init__.py
diff --git a/crm/search_criteria/target_variance_report/target_variance_report.js b/selling/search_criteria/target_variance_report/target_variance_report.js
similarity index 100%
rename from crm/search_criteria/target_variance_report/target_variance_report.js
rename to selling/search_criteria/target_variance_report/target_variance_report.js
diff --git a/crm/search_criteria/target_variance_report/target_variance_report.py b/selling/search_criteria/target_variance_report/target_variance_report.py
similarity index 100%
rename from crm/search_criteria/target_variance_report/target_variance_report.py
rename to selling/search_criteria/target_variance_report/target_variance_report.py
diff --git a/crm/search_criteria/target_variance_report/target_variance_report.txt b/selling/search_criteria/target_variance_report/target_variance_report.txt
similarity index 100%
rename from crm/search_criteria/target_variance_report/target_variance_report.txt
rename to selling/search_criteria/target_variance_report/target_variance_report.txt
diff --git a/material_management/search_criteria/__init__.py b/selling/search_criteria/territories_target_variance_item_group_wise/__init__.py
similarity index 100%
rename from material_management/search_criteria/__init__.py
rename to selling/search_criteria/territories_target_variance_item_group_wise/__init__.py
diff --git a/crm/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.js b/selling/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.js
similarity index 100%
rename from crm/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.js
rename to selling/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.js
diff --git a/crm/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.py b/selling/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.py
similarity index 100%
rename from crm/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.py
rename to selling/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.py
diff --git a/crm/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.txt b/selling/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.txt
similarity index 100%
rename from crm/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.txt
rename to selling/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.txt
diff --git a/material_management/search_criteria/itemwise_price_list/__init__.py b/selling/search_criteria/territory_item_group_wise_gp/__init__.py
similarity index 100%
rename from material_management/search_criteria/itemwise_price_list/__init__.py
rename to selling/search_criteria/territory_item_group_wise_gp/__init__.py
diff --git a/crm/search_criteria/territory_item_group_wise_gp/territory_item_group_wise_gp.py b/selling/search_criteria/territory_item_group_wise_gp/territory_item_group_wise_gp.py
similarity index 100%
rename from crm/search_criteria/territory_item_group_wise_gp/territory_item_group_wise_gp.py
rename to selling/search_criteria/territory_item_group_wise_gp/territory_item_group_wise_gp.py
diff --git a/crm/search_criteria/territory_item_group_wise_gp/territory_item_group_wise_gp.txt b/selling/search_criteria/territory_item_group_wise_gp/territory_item_group_wise_gp.txt
similarity index 100%
rename from crm/search_criteria/territory_item_group_wise_gp/territory_item_group_wise_gp.txt
rename to selling/search_criteria/territory_item_group_wise_gp/territory_item_group_wise_gp.txt
diff --git a/material_management/search_criteria/shortage_to_indent/__init__.py b/selling/search_criteria/territory_sales___variance_report/__init__.py
similarity index 100%
rename from material_management/search_criteria/shortage_to_indent/__init__.py
rename to selling/search_criteria/territory_sales___variance_report/__init__.py
diff --git a/crm/search_criteria/territory_sales___variance_report/territory_sales___variance_report.js b/selling/search_criteria/territory_sales___variance_report/territory_sales___variance_report.js
similarity index 100%
rename from crm/search_criteria/territory_sales___variance_report/territory_sales___variance_report.js
rename to selling/search_criteria/territory_sales___variance_report/territory_sales___variance_report.js
diff --git a/crm/search_criteria/territory_sales___variance_report/territory_sales___variance_report.py b/selling/search_criteria/territory_sales___variance_report/territory_sales___variance_report.py
similarity index 100%
rename from crm/search_criteria/territory_sales___variance_report/territory_sales___variance_report.py
rename to selling/search_criteria/territory_sales___variance_report/territory_sales___variance_report.py
diff --git a/crm/search_criteria/territory_sales___variance_report/territory_sales___variance_report.txt b/selling/search_criteria/territory_sales___variance_report/territory_sales___variance_report.txt
similarity index 100%
rename from crm/search_criteria/territory_sales___variance_report/territory_sales___variance_report.txt
rename to selling/search_criteria/territory_sales___variance_report/territory_sales___variance_report.txt
diff --git a/material_management/search_criteria/stock_aging_report/__init__.py b/selling/search_criteria/total_target_variance_report/__init__.py
similarity index 100%
rename from material_management/search_criteria/stock_aging_report/__init__.py
rename to selling/search_criteria/total_target_variance_report/__init__.py
diff --git a/crm/search_criteria/total_target_variance_report/total_target_variance_report.js b/selling/search_criteria/total_target_variance_report/total_target_variance_report.js
similarity index 100%
rename from crm/search_criteria/total_target_variance_report/total_target_variance_report.js
rename to selling/search_criteria/total_target_variance_report/total_target_variance_report.js
diff --git a/crm/search_criteria/total_target_variance_report/total_target_variance_report.py b/selling/search_criteria/total_target_variance_report/total_target_variance_report.py
similarity index 100%
rename from crm/search_criteria/total_target_variance_report/total_target_variance_report.py
rename to selling/search_criteria/total_target_variance_report/total_target_variance_report.py
diff --git a/crm/search_criteria/total_target_variance_report/total_target_variance_report.sql b/selling/search_criteria/total_target_variance_report/total_target_variance_report.sql
similarity index 100%
rename from crm/search_criteria/total_target_variance_report/total_target_variance_report.sql
rename to selling/search_criteria/total_target_variance_report/total_target_variance_report.sql
diff --git a/crm/search_criteria/total_target_variance_report/total_target_variance_report.txt b/selling/search_criteria/total_target_variance_report/total_target_variance_report.txt
similarity index 100%
rename from crm/search_criteria/total_target_variance_report/total_target_variance_report.txt
rename to selling/search_criteria/total_target_variance_report/total_target_variance_report.txt
diff --git a/material_management/search_criteria/stock_ledger/__init__.py b/selling/search_criteria/variance_report/__init__.py
similarity index 100%
rename from material_management/search_criteria/stock_ledger/__init__.py
rename to selling/search_criteria/variance_report/__init__.py
diff --git a/crm/search_criteria/variance_report/variance_report.js b/selling/search_criteria/variance_report/variance_report.js
similarity index 100%
rename from crm/search_criteria/variance_report/variance_report.js
rename to selling/search_criteria/variance_report/variance_report.js
diff --git a/crm/search_criteria/variance_report/variance_report.py b/selling/search_criteria/variance_report/variance_report.py
similarity index 100%
rename from crm/search_criteria/variance_report/variance_report.py
rename to selling/search_criteria/variance_report/variance_report.py
diff --git a/crm/search_criteria/variance_report/variance_report.sql b/selling/search_criteria/variance_report/variance_report.sql
similarity index 100%
rename from crm/search_criteria/variance_report/variance_report.sql
rename to selling/search_criteria/variance_report/variance_report.sql
diff --git a/crm/search_criteria/variance_report/variance_report.txt b/selling/search_criteria/variance_report/variance_report.txt
similarity index 100%
rename from crm/search_criteria/variance_report/variance_report.txt
rename to selling/search_criteria/variance_report/variance_report.txt
diff --git a/settings/Module Def/Settings/Settings.txt b/settings/Module Def/Settings/Settings.txt
deleted file mode 100644
index 38bcbb5b0d..0000000000
--- a/settings/Module Def/Settings/Settings.txt	
+++ /dev/null
@@ -1,218 +0,0 @@
-[
-	{
-		'_last_update': None,
-		'creation': '2010-11-30 22:45:39',
-		'disabled': 'Yes',
-		'docstatus': 0,
-		'doctype': 'Module Def',
-		'doctype_list': None,
-		'file_list': None,
-		'idx': None,
-		'is_hidden': None,
-		'last_updated_date': '2010-11-29 12:02:02',
-		'modified': '2010-09-25 00:00:00',
-		'modified_by': 'Administrator',
-		'module_desc': None,
-		'module_icon': None,
-		'module_label': 'Settings',
-		'module_name': 'Settings',
-		'module_page': None,
-		'module_seq': None,
-		'name': 'Settings',
-		'owner': 'Administrator',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
-		'trash_reason': None,
-		'widget_code': None
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 15:04:47',
-		'description': None,
-		'display_name': 'Country',
-		'doc_name': 'Country',
-		'doc_type': 'Setup Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 1,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': '000003098',
-		'owner': 'Administrator',
-		'parent': 'Settings',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 15:04:47',
-		'description': None,
-		'display_name': 'State',
-		'doc_name': 'State',
-		'doc_type': 'Setup Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 2,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': '000003099',
-		'owner': 'Administrator',
-		'parent': 'Settings',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 15:04:47',
-		'description': None,
-		'display_name': 'Currency',
-		'doc_name': 'Currency',
-		'doc_type': 'Setup Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 3,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': '000003100',
-		'owner': 'Administrator',
-		'parent': 'Settings',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 15:04:47',
-		'description': None,
-		'display_name': 'Price List',
-		'doc_name': 'Price List',
-		'doc_type': 'Setup Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 4,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': '000003101',
-		'owner': 'Administrator',
-		'parent': 'Settings',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 15:04:47',
-		'description': None,
-		'display_name': 'Warehouse Type',
-		'doc_name': 'Warehouse Type',
-		'doc_type': 'Setup Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 5,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': '000003102',
-		'owner': 'Administrator',
-		'parent': 'Settings',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 15:04:47',
-		'description': None,
-		'display_name': 'Warehouse',
-		'doc_name': 'Warehouse',
-		'doc_type': 'Setup Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 6,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': '000003103',
-		'owner': 'Administrator',
-		'parent': 'Settings',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 15:04:47',
-		'description': None,
-		'display_name': 'UOM',
-		'doc_name': 'UOM',
-		'doc_type': 'Setup Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 7,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': '000003104',
-		'owner': 'Administrator',
-		'parent': 'Settings',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 15:04:47',
-		'description': None,
-		'display_name': 'Terms and Conditions',
-		'doc_name': 'Terms And Conditions',
-		'doc_type': 'Setup Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 8,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': '000003105',
-		'owner': 'Administrator',
-		'parent': 'Settings',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2011-03-24 15:04:47',
-		'description': None,
-		'display_name': 'Terrioty',
-		'doc_name': 'Territoy',
-		'doc_type': 'Setup Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 9,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': '000003106',
-		'owner': 'Administrator',
-		'parent': 'Settings',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	}
-]
\ No newline at end of file
diff --git a/settings/doctype/authorization_control/authorization_control.txt b/settings/doctype/authorization_control/authorization_control.txt
deleted file mode 100644
index 3c81797660..0000000000
--- a/settings/doctype/authorization_control/authorization_control.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2010-06-15 13:11:09', 'search_fields': None, 'module': 'Settings', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 255, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': '', 'name': 'Authorization Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-11-08 14:33:07', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/settings/doctype/authorization_rule/authorization_rule.txt b/settings/doctype/authorization_rule/authorization_rule.txt
deleted file mode 100644
index ca0d69f601..0000000000
--- a/settings/doctype/authorization_rule/authorization_rule.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-06-09 12:53:05', 'search_fields': 'transaction,based_on,value,system_user,system_role,approving_user,approving_role', 'module': 'Settings', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 84, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': 1, 'allow_print': None, 'autoname': 'AR.####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': 'Master', 'name': 'Authorization Rule', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM01034', 'parent': 'Authorization Rule', 'read': 1, 'create': 1, 'creation': '2010-06-09 12:53:05', 'modified': '2010-12-09 17:09:12', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM01049', 'parent': 'Authorization Rule', 'read': 1, 'create': 1, 'creation': '2010-06-25 13:44:28', 'modified': '2010-12-09 17:09:12', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'System Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-11-08 10:33:52', 'doctype': 'DocField', 'oldfieldname': 'company', 'owner': 'harshada@webnotestech.com', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Company', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Authorization Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06393', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-12-09 17:09:12', 'parenttype': 'DocType', 'fieldname': 'company', 'fieldtype': 'Link', 'options': 'Company', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-06-09 12:53:05', 'doctype': 'DocField', 'oldfieldname': 'transaction', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Transaction', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Authorization Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05301', 'idx': 2, 'default': None, 'colour': 'White:FFF', 'modified': '2010-12-09 17:09:12', 'parenttype': 'DocType', 'fieldname': 'transaction', 'fieldtype': 'Select', 'options': '\nDelivery Note\nPurchase Invoice\nPurchase Order\nPurchase Receipt\nQuotation\nSales Invoice\nSales Order\nStock Entry\nExpense Voucher\nAppraisal', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-06-10 16:10:36', 'doctype': 'DocField', 'oldfieldname': 'based_on', 'owner': 'saumil@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Based On', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Authorization Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05326', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-12-09 17:09:12', 'parenttype': 'DocType', 'fieldname': 'based_on', 'fieldtype': 'Select', 'options': '\nGrand Total\nAverage Discount\nCustomerwise Discount\nItemwise Discount\nTotal Claimed Amount\nNot Applicable', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-06-09 12:53:05', 'doctype': 'DocField', 'oldfieldname': 'value', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Above Value', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Authorization Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05305', 'idx': 4, 'default': '0.00', 'colour': None, 'modified': '2010-12-09 17:09:12', 'parenttype': 'DocType', 'fieldname': 'value', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-06-11 10:07:55', 'doctype': 'DocField', 'oldfieldname': 'master_name', 'owner': 'saumil@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Customer / Item Name', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Authorization Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05329', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-12-09 17:09:12', 'parenttype': 'DocType', 'fieldname': 'master_name', 'fieldtype': 'Link', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-07-05 09:14:31', 'doctype': 'DocField', 'oldfieldname': 'system_role', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Applicable To (Role)', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Authorization Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05516', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-12-09 17:09:12', 'parenttype': 'DocType', 'fieldname': 'system_role', 'fieldtype': 'Link', 'options': 'Role', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-06-09 12:53:05', 'doctype': 'DocField', 'oldfieldname': 'system_user', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Applicable To (User)', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Authorization Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05302', 'idx': 7, 'default': None, 'colour': 'White:FFF', 'modified': '2010-12-09 17:09:12', 'parenttype': 'DocType', 'fieldname': 'system_user', 'fieldtype': 'Link', 'options': 'Profile', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-08-26 11:26:50', 'doctype': 'DocField', 'oldfieldname': 'to_emp', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Applicable To (Employee)', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'This will be used for setting rule in HR module', 'parent': 'Authorization Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06040', 'idx': 8, 'default': None, 'colour': 'White:FFF', 'modified': '2010-12-09 17:09:12', 'parenttype': 'DocType', 'fieldname': 'to_emp', 'fieldtype': 'Link', 'options': 'Employee', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-08-26 11:26:50', 'doctype': 'DocField', 'oldfieldname': 'to_designation', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Applicable To (Designation)', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'This will be used for setting rule in HR module', 'parent': 'Authorization Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06041', 'idx': 9, 'default': None, 'colour': 'White:FFF', 'modified': '2010-12-09 17:09:12', 'parenttype': 'DocType', 'fieldname': 'to_designation', 'fieldtype': 'Link', 'options': 'Designation', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-06-09 12:53:05', 'doctype': 'DocField', 'oldfieldname': 'approving_role', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Approving Role', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Authorization Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05303', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-12-09 17:09:12', 'parenttype': 'DocType', 'fieldname': 'approving_role', 'fieldtype': 'Link', 'options': 'Role', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-06-09 12:53:05', 'doctype': 'DocField', 'oldfieldname': 'approving_user', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Approving User', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Authorization Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05304', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-12-09 17:09:12', 'parenttype': 'DocType', 'fieldname': 'approving_user', 'fieldtype': 'Link', 'options': 'Profile', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-06-15 12:40:51', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'saumil@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Authorization Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05344', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-12-09 17:09:12', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/settings/doctype/email_settings/email_settings.txt b/settings/doctype/email_settings/email_settings.txt
deleted file mode 100644
index 70ef8d96dd..0000000000
--- a/settings/doctype/email_settings/email_settings.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-07-19 15:18:50', 'search_fields': None, 'module': 'Settings', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'harshada@webnotestech.com', 'in_dialog': 1, 'in_create': 1, 'read_only': None, 'allow_email': 1, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 32, 'menu_index': None, 'docstatus': 0, 'allow_copy': 1, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': 1, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': '', 'name': 'Email Settings', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-10-26 10:38:37', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM01073', 'parent': 'Email Settings', 'read': 1, 'create': 1, 'creation': '2010-07-19 15:18:50', 'modified': '2010-10-26 10:38:37', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM01114', 'parent': 'Email Settings', 'read': 1, 'create': 1, 'creation': '2010-08-07 18:57:34', 'modified': '2010-10-26 10:38:37', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'System Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-07-19 15:18:50', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Outgoing Mail Server', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Email Settings', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05646', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-10-26 10:38:37', 'parenttype': 'DocType', 'fieldname': 'outgoing_mail_server', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-25 12:38:58', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Mail Port', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Email Settings', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06001', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-10-26 10:38:37', 'parenttype': 'DocType', 'fieldname': 'mail_port', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-25 12:38:58', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Use SSL', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Email Settings', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06000', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-10-26 10:38:37', 'parenttype': 'DocType', 'fieldname': 'use_ssl', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-07-19 15:18:50', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Login Id', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Email Settings', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05647', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-10-26 10:38:37', 'parenttype': 'DocType', 'fieldname': 'mail_login', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-07-19 15:18:50', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Mail Password', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Email Settings', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05648', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-10-26 10:38:37', 'parenttype': 'DocType', 'fieldname': 'mail_password', 'fieldtype': 'Password', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-07-19 15:18:50', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Auto Email Id', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Email Settings', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05649', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-10-26 10:38:37', 'parenttype': 'DocType', 'fieldname': 'auto_email_id', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/settings/doctype/naming_series/__init__.py b/settings/doctype/naming_series/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/settings/doctype/naming_series/naming_series.txt b/settings/doctype/naming_series/naming_series.txt
deleted file mode 100644
index 1c33da3b6e..0000000000
--- a/settings/doctype/naming_series/naming_series.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-09-23 18:20:39', 'search_fields': None, 'module': 'Settings', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': 1, 'allow_email': None, 'dt_template': None, 'hide_heading': 1, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 76, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': '', 'name': 'Naming Series', 'idx': None, 'hide_toolbar': 1, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-11-26 18:45:26', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00441', 'parent': 'Naming Series', 'read': 1, 'create': 1, 'creation': '2009-09-23 18:24:22', 'modified': '2010-11-26 18:45:26', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00442', 'parent': 'Naming Series', 'read': 1, 'create': 1, 'creation': '2009-09-23 18:24:22', 'modified': '2010-11-26 18:45:26', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'System Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00443', 'parent': 'Naming Series', 'read': 1, 'create': None, 'creation': '2009-09-23 18:24:22', 'modified': '2010-11-26 18:45:26', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 3, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00444', 'parent': 'Naming Series', 'read': 1, 'create': 0, 'creation': '2009-09-23 18:24:22', 'modified': '2010-11-26 18:45:26', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 4, 'parenttype': 'DocType', 'role': 'System Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM01170', 'parent': 'Naming Series', 'read': 1, 'create': None, 'creation': '2010-09-07 18:16:46', 'modified': '2010-11-26 18:45:26', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 5, 'parenttype': 'DocType', 'role': 'Guest', 'owner': 'saumil@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-04-16 12:09:36', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Head HTML', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Naming Series', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04661', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-11-26 18:45:26', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-11-26 18:45:26', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'saumil@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Naming Series', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06465', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-11-26 18:45:26', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': 'Simple', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-11-17 10:30:43', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'saumil@webnotestech.com', 'reqd': None, 'in_filter': 0, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Setup Series', 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Set prefix for numbering series on your transactions', 'parent': 'Naming Series', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06412', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-11-26 18:45:26', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-09-23 18:20:39', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Select Transaction', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Naming Series', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03066', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-11-26 18:45:26', 'parenttype': 'DocType', 'fieldname': 'select_doc_for_series', 'fieldtype': 'Select', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-10-26 11:55:21', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Help HTML', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Naming Series', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06350', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-11-26 18:45:26', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': '
\nWrite the list of series options in the list below. Each on a new line
\nAllowed special characters are "/" and "-"
\nExamples:
\nINV-
\nINV-10-
\nINVK-
\n
', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-10-25 11:14:29', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Set Series', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Naming Series', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06332', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-11-26 18:45:26', 'parenttype': 'DocType', 'fieldname': 'set_options', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-10-27 14:03:36', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'User must always select', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Check this if you want to force the user to select a series before saving. There will be no default if you check this.', 'parent': 'Naming Series', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06371', 'idx': 7, 'default': None, 'colour': 'White:FFF', 'modified': '2010-11-26 18:45:26', 'parenttype': 'DocType', 'fieldname': 'user_must_always_select', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-09-23 18:20:39', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Update', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Naming Series', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03069', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-11-26 18:45:26', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'update_series', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-11-17 10:26:14', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'saumil@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Update Series', 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Set starting number for series of your transactions', 'parent': 'Naming Series', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06406', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-11-26 18:45:26', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-11-17 10:26:14', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'saumil@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Prefix', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Naming Series', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06407', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-11-26 18:45:26', 'parenttype': 'DocType', 'fieldname': 'prefix', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-11-17 10:26:14', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'saumil@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Starts From', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Naming Series', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06408', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-11-26 18:45:26', 'parenttype': 'DocType', 'fieldname': 'starts_from', 'fieldtype': 'Int', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-11-17 10:26:14', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'saumil@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Update Series Start', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Naming Series', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06409', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-11-26 18:45:26', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'update_series_start', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/settings/doctype/notification_control/__init__.py b/settings/doctype/notification_control/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/settings/doctype/notification_control/notification_control.txt b/settings/doctype/notification_control/notification_control.txt
deleted file mode 100644
index 421d2fcea2..0000000000
--- a/settings/doctype/notification_control/notification_control.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-08-20 16:36:59', 'search_fields': None, 'module': 'Settings', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': 1, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 117, 'menu_index': None, 'docstatus': 0, 'allow_copy': 1, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': 1, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': '', 'name': 'Notification Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-10-14 10:48:02', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM01123', 'parent': 'Notification Control', 'read': 1, 'create': 1, 'creation': '2010-08-20 16:38:27', 'modified': '2010-10-14 10:48:02', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM01124', 'parent': 'Notification Control', 'read': 1, 'create': 1, 'creation': '2010-08-20 16:38:27', 'modified': '2010-10-14 10:48:02', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'System Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-20 16:36:59', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Send Auto-notification for', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05954', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-20 16:51:31', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Sales', 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05961', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-20 16:36:59', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Enquiry', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05955', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'enquiry', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-20 16:36:59', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Quotation', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05956', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'quotation', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-20 16:36:59', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Sales Order', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05957', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'sales_order', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-20 16:36:59', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Delivery Note', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05959', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'delivery_note', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-20 18:14:05', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Sales Invoice', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05967', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'receivable_voucher', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-20 16:51:31', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Purchase', 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05962', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-20 16:51:31', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Purchase Order', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05963', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'purchase_order', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-20 16:51:31', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Purchase Receipt', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05964', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'purchase_receipt', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-08-20 16:51:31', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Purchase Invoice', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05965', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'payable_voucher', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-10-14 08:16:24', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Expense Voucher', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06303', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'expense_voucher', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-09-02 11:25:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'rushabh@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Customize the Notification', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06089', 'idx': 13, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-09-02 11:25:33', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'rushabh@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Select Transaction', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06090', 'idx': 14, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'select_transaction', 'fieldtype': 'Select', 'options': '\nQuotation\nSales Order\nDelivery Note\nSales Invoice\nPayment Received\nPurchase Order\nPurchase Receipt\nPayment Sent\nExpense Voucher Approved\nExpense Voucher Rejected', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-09-02 11:25:33', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'rushabh@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Custom Message', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06091', 'idx': 15, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'custom_message', 'fieldtype': 'Text Editor', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-09-02 11:25:33', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'rushabh@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Update', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06092', 'idx': 16, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'set_message', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-09-02 11:25:33', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'rushabh@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Quotation Message', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06093', 'idx': 17, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'quotation_message', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-09-02 11:25:33', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'rushabh@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Sales Order Message', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06094', 'idx': 18, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'sales_order_message', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-09-02 11:25:33', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'rushabh@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Delivery Note Message', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06095', 'idx': 19, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'delivery_note_message', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-09-02 11:25:33', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'rushabh@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Sales Invoice Message', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06096', 'idx': 20, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'sales_invoice_message', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-09-02 11:25:33', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'rushabh@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Payment Received Message', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06097', 'idx': 21, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'payment_received_message', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-09-02 11:25:33', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'rushabh@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Purchase Order Message', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06098', 'idx': 22, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'purchase_order_message', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-09-02 11:25:33', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'rushabh@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Purchase Receipt Message', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06099', 'idx': 23, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'purchase_receipt_message', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-09-02 11:25:33', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'rushabh@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Payment Sent Message', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06100', 'idx': 24, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'payment_sent_message', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-10-14 08:16:24', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Expense Voucher Approved Message', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06302', 'idx': 25, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'expense_voucher_approved_message', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-10-14 08:16:24', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Expense Voucher Rejected Message', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Notification Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06304', 'idx': 26, 'default': None, 'colour': None, 'modified': '2010-10-14 10:48:02', 'parenttype': 'DocType', 'fieldname': 'expense_voucher_rejected_message', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/settings/doctype/permission_control/__init__.py b/settings/doctype/permission_control/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/settings/doctype/permission_control/permission_control.txt b/settings/doctype/permission_control/permission_control.txt
deleted file mode 100644
index 0aae67cddf..0000000000
--- a/settings/doctype/permission_control/permission_control.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-01-07 10:42:02', 'search_fields': None, 'module': 'Settings', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'saumil@webnotestech.com', 'in_dialog': None, 'in_create': 1, 'read_only': 1, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 47, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': '', 'name': 'Permission Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-11-18 20:24:33', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/settings/doctype/print_heading/__init__.py b/settings/doctype/print_heading/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/settings/doctype/print_heading/print_heading.txt b/settings/doctype/print_heading/print_heading.txt
deleted file mode 100644
index 4832e18d4a..0000000000
--- a/settings/doctype/print_heading/print_heading.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-05-28 16:08:11', 'search_fields': 'print_heading', 'module': 'Settings', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 28, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:print_heading', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Print Heading', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01019', 'parent': 'Print Heading', 'read': 1, 'create': 1, 'creation': '2010-05-31 09:51:59', 'modified': '2010-09-20 10:32:30', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'All', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-05-31 09:08:23', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Print Heading', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05127', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 10:32:30', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-05-28 16:08:11', 'doctype': 'DocField', 'oldfieldname': 'print_heading', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Print Heading', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Print Heading', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05110', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 10:32:30', 'parenttype': 'DocType', 'fieldname': 'print_heading', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-08-06 18:26:35', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Print Heading', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05844', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-20 10:32:30', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/settings/doctype/series_detail/__init__.py b/settings/doctype/series_detail/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/settings/doctype/series_detail/series_detail.txt b/settings/doctype/series_detail/series_detail.txt
deleted file mode 100644
index a195870025..0000000000
--- a/settings/doctype/series_detail/series_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-06-12 17:10:41', 'search_fields': None, 'module': 'Settings', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 2, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Series Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Read Only', 'creation': '2009-06-12 17:10:41', 'doctype': 'DocField', 'oldfieldname': 'series', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Series', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Series Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02330', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-03-31 10:05:22', 'parenttype': 'DocType', 'fieldname': 'series', 'fieldtype': 'Read Only', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Check', 'creation': '2009-06-12 17:10:41', 'doctype': 'DocField', 'oldfieldname': 'remove', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Remove', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Series Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02331', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-03-31 10:05:22', 'parenttype': 'DocType', 'fieldname': 'remove', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/settings/doctype/setup_wizard_control/__init__.py b/settings/doctype/setup_wizard_control/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/settings/doctype/setup_wizard_control/setup_wizard_control.txt b/settings/doctype/setup_wizard_control/setup_wizard_control.txt
deleted file mode 100644
index ab9a03d6c0..0000000000
--- a/settings/doctype/setup_wizard_control/setup_wizard_control.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-07-13 15:32:04', 'search_fields': None, 'module': 'Settings', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 108, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': None, 'name': 'Setup Wizard Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/settings/doctype/sms_settings/__init__.py b/settings/doctype/sms_settings/__init__.py
deleted file mode 100755
index e69de29bb2..0000000000
diff --git a/settings/doctype/sms_settings/sms_settings.txt b/settings/doctype/sms_settings/sms_settings.txt
deleted file mode 100755
index 7a84ae4253..0000000000
--- a/settings/doctype/sms_settings/sms_settings.txt
+++ /dev/null
@@ -1,320 +0,0 @@
-[
-	{
-		'_last_update': '1306301711',
-		'allow_attach': None,
-		'allow_copy': 1,
-		'allow_email': 1,
-		'allow_print': 1,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-24 18:21:16',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': 0,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': 1,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-25 11:59:34',
-		'modified_by': 'Administrator',
-		'module': 'Settings',
-		'name': 'SMS Settings',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': 0,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': None,
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
-		'version': 16
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2011-05-24 18:21:16',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-05-25 11:59:34',
-		'modified_by': 'Administrator',
-		'name': 'PERM00846',
-		'owner': 'Administrator',
-		'parent': 'SMS Settings',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2011-05-24 18:21:16',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-05-25 11:59:34',
-		'modified_by': 'Administrator',
-		'name': 'PERM00847',
-		'owner': 'Administrator',
-		'parent': 'SMS Settings',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-24 18:21:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 11:59:34',
-		'modified_by': 'Administrator',
-		'name': 'FL05444',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'SMS Settings',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-24 18:21:16',
-		'default': None,
-		'depends_on': None,
-		'description': 'Eg. smsgateway.com/api/send_sms.cgi',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'sms_gateway_url',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'SMS Gateway URL',
-		'modified': '2011-05-25 11:59:34',
-		'modified_by': 'Administrator',
-		'name': 'FL05440',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'SMS Settings',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-24 18:21:16',
-		'default': None,
-		'depends_on': None,
-		'description': 'Enter url parameter for message',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'message_parameter',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Message Parameter',
-		'modified': '2011-05-25 11:59:34',
-		'modified_by': 'Administrator',
-		'name': 'FL05441',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'SMS Settings',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-24 18:21:16',
-		'default': None,
-		'depends_on': None,
-		'description': 'Enter url parameter for receiver nos',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'receiver_parameter',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Receiver Parameter',
-		'modified': '2011-05-25 11:59:34',
-		'modified_by': 'Administrator',
-		'name': 'FL05442',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'SMS Settings',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-24 18:21:16',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Static Parameters',
-		'modified': '2011-05-25 11:59:34',
-		'modified_by': 'Administrator',
-		'name': 'FL05445',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'SMS Settings',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-24 18:21:16',
-		'default': None,
-		'depends_on': None,
-		'description': 'Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'static_parameter_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Static Parameter Details',
-		'modified': '2011-05-25 11:59:34',
-		'modified_by': 'Administrator',
-		'name': 'FL05443',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Static Parameter Detail',
-		'owner': 'Administrator',
-		'parent': 'SMS Settings',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/settings/doctype/static_parameter_detail/__init__.py b/settings/doctype/static_parameter_detail/__init__.py
deleted file mode 100755
index e69de29bb2..0000000000
diff --git a/settings/doctype/static_parameter_detail/static_parameter_detail.txt b/settings/doctype/static_parameter_detail/static_parameter_detail.txt
deleted file mode 100755
index fc029d735d..0000000000
--- a/settings/doctype/static_parameter_detail/static_parameter_detail.txt
+++ /dev/null
@@ -1,131 +0,0 @@
-[
-	{
-		'_last_update': None,
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 11:26:05',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': 1,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-24 18:42:30',
-		'modified_by': 'Administrator',
-		'module': 'Settings',
-		'name': 'Static Parameter Detail',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': None,
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
-		'version': 4
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 11:26:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'parameter',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Parameter',
-		'modified': '2011-05-25 11:26:05',
-		'modified_by': 'Administrator',
-		'name': 'FL05012',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Static Parameter Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 11:26:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'value',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Value',
-		'modified': '2011-05-25 11:26:05',
-		'modified_by': 'Administrator',
-		'name': 'FL05013',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Static Parameter Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	}
-]
\ No newline at end of file
diff --git a/settings/doctype/update_series/__init__.py b/settings/doctype/update_series/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/settings/doctype/update_series/update_series.txt b/settings/doctype/update_series/update_series.txt
deleted file mode 100644
index 27a9bf5de9..0000000000
--- a/settings/doctype/update_series/update_series.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-04-13 14:48:50', 'search_fields': None, 'module': 'Settings', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 1, 'read_only': 1, 'allow_email': 1, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 5, 'menu_index': None, 'docstatus': 0, 'allow_copy': 1, 'istable': None, 'description': None, 'parent': None, 'server_code': 'class DocType:\n  def __init__(self, doc, doclist=[]):\n    self.doc = doc\n    self.doclist = doclist\n\n  def update_series(self):\n    series = sql("select name,current from `tabSeries` where name = %s", self.doc.prefix,as_dict = 1)\n    if series:\n      msgprint("This is going to update Series with Prefix : " + series[0][\'name\'] + " from Current : " + cstr(series[0][\'current\']) + " to Current : "+ cstr(self.doc.current))\n      sql("update `tabSeries` set current = \'%s\' where name = \'%s\'" % (self.doc.current,series[0][\'name\']))\n      msgprint("Series Updated Successfully")\n    else:\n      msgprint("Please Check Prefix as there is no such Prefix : "+ self.doc.prefix +" Or Try Insert Button")\n\n  def insert_series(self):\n    #sql("start transaction")\n    series = sql("select name,current from `tabSeries` where name = %s", self.doc.prefix, as_dict = 1)\n    if series:\n      msgprint("Series with Prefix : " + series[0][\'name\'] + "already in the system . Try Update Button")\n    else:\n      msgprint("This is going to Insert Series with Prefix : " + cstr(self.doc.prefix) + " Current: " + cstr(self.doc.current))\n      sql("insert into `tabSeries` (name,current) values (\'%s\',\'%s\')" % (self.doc.prefix, self.doc.current))\n      msgprint("Series Inserted Successfully")', 'allow_trash': None, 'allow_print': 1, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Update Series', 'idx': None, 'hide_toolbar': 0, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00280', 'parent': 'Update Series', 'read': 1, 'create': 0, 'creation': '2009-04-13 14:48:50', 'modified': '2010-03-30 13:55:09', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-04-13 14:48:50', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Prefix', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Update Series', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01891', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-03-30 13:55:09', 'parenttype': 'DocType', 'fieldname': 'prefix', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-04-13 14:48:50', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Current', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Update Series', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01892', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-03-30 13:55:09', 'parenttype': 'DocType', 'fieldname': 'current', 'fieldtype': 'Int', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-04-13 14:48:50', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Update', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Update Series', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01893', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-03-30 13:55:09', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'update_series', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-04-13 14:48:50', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Insert', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Update Series', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01894', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-03-30 13:55:09', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'insert_series', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/settings/doctype/workflow_action_detail/__init__.py b/settings/doctype/workflow_action_detail/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/settings/doctype/workflow_action_detail/workflow_action_detail.txt b/settings/doctype/workflow_action_detail/workflow_action_detail.txt
deleted file mode 100644
index e1520ec936..0000000000
--- a/settings/doctype/workflow_action_detail/workflow_action_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-11-23 13:52:22', 'search_fields': None, 'module': 'Settings', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'swarnalata@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 5, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Workflow Action Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-11-23 13:52:22', 'doctype': 'DocField', 'oldfieldname': 'action_field', 'owner': 'swarnalata@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Field', 'width': '200px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Workflow Action Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03385', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-03-31 09:44:54', 'parenttype': 'DocType', 'fieldname': 'action_field', 'fieldtype': 'Select', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-23 13:52:22', 'doctype': 'DocField', 'oldfieldname': 'action_value', 'owner': 'swarnalata@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Value', 'width': '200px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Workflow Action Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03386', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-03-31 09:44:54', 'parenttype': 'DocType', 'fieldname': 'action_value', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/settings/doctype/workflow_engine/__init__.py b/settings/doctype/workflow_engine/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/settings/doctype/workflow_engine/workflow_engine.txt b/settings/doctype/workflow_engine/workflow_engine.txt
deleted file mode 100644
index 99b58eff17..0000000000
--- a/settings/doctype/workflow_engine/workflow_engine.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-11-23 14:28:25', 'search_fields': None, 'module': 'Settings', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'swarnalata@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 4, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Workflow Engine', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/settings/doctype/workflow_rule/__init__.py b/settings/doctype/workflow_rule/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/settings/doctype/workflow_rule/workflow_rule.txt b/settings/doctype/workflow_rule/workflow_rule.txt
deleted file mode 100644
index bf5d9a060c..0000000000
--- a/settings/doctype/workflow_rule/workflow_rule.txt
+++ /dev/null
@@ -1,710 +0,0 @@
-[
-	{
-		'_last_update': '1300960468',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'field:rule_name',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-11-30 22:45:39',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'last_update': '1294161037',
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2010-09-20 14:06:57',
-		'modified_by': 'Administrator',
-		'module': 'Settings',
-		'name': 'Workflow Rule',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'select_form,rule_status',
-		'section_style': 'Tray',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 31
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-24 15:58:12',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Rule Definition',
-		'modified': '2011-03-24 15:58:12',
-		'modified_by': 'Administrator',
-		'name': '000006338',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Workflow Rule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-24 15:58:12',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Intro HTML',
-		'modified': '2011-03-24 15:58:12',
-		'modified_by': 'Administrator',
-		'name': '000006339',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': 'Select form for which you want to define rules,set priority & status.',
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Workflow Rule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:42:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'rule_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Rule Name',
-		'modified': '2011-03-24 15:58:12',
-		'modified_by': 'Administrator',
-		'name': 'FL02596',
-		'no_copy': None,
-		'oldfieldname': 'rule_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Workflow Rule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:45:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'rule_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Rule Name',
-		'modified': '2010-11-30 22:45:39',
-		'modified_by': 'Administrator',
-		'name': 'FL03601',
-		'no_copy': None,
-		'oldfieldname': 'rule_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Workflow Rule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-11-30 22:45:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'rule_status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Rule Status',
-		'modified': '2011-03-24 15:58:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03602',
-		'no_copy': None,
-		'oldfieldname': 'rule_status',
-		'oldfieldtype': 'Select',
-		'options': '\nActive\nInactive',
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Workflow Rule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-11-30 22:45:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'select_form',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': 1,
-		'label': 'Select Form',
-		'modified': '2011-03-24 15:58:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03603',
-		'no_copy': None,
-		'oldfieldname': 'select_form',
-		'oldfieldtype': 'Link',
-		'options': 'DocType',
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Workflow Rule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:42:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'rule_priority',
-		'fieldtype': 'Int',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Rule Priority',
-		'modified': '2011-03-24 15:58:12',
-		'modified_by': 'Administrator',
-		'name': 'FL02597',
-		'no_copy': None,
-		'oldfieldname': 'rule_priority',
-		'oldfieldtype': 'Int',
-		'options': None,
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Workflow Rule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:45:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'rule_priority',
-		'fieldtype': 'Int',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Rule Priority',
-		'modified': '2010-11-30 22:45:39',
-		'modified_by': 'Administrator',
-		'name': 'FL03604',
-		'no_copy': None,
-		'oldfieldname': 'rule_priority',
-		'oldfieldtype': 'Int',
-		'options': None,
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Workflow Rule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-03-24 15:58:12',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Define Rule',
-		'modified': '2011-03-24 15:58:12',
-		'modified_by': 'Administrator',
-		'name': '000006340',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Workflow Rule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:45:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'workflow_rule_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Workflow Rule Details',
-		'modified': '2011-03-24 15:58:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03606',
-		'no_copy': None,
-		'oldfieldname': 'workflow_rule_details',
-		'oldfieldtype': 'Table',
-		'options': 'Workflow Rule Detail',
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Workflow Rule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-11-30 22:45:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'extra_condition',
-		'fieldtype': 'Code',
-		'hidden': 1,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Extra Condition',
-		'modified': '2011-03-24 15:58:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03607',
-		'no_copy': None,
-		'oldfieldname': 'extra_condition',
-		'oldfieldtype': 'Code',
-		'options': None,
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Workflow Rule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-03-24 15:58:12',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Action Detail',
-		'modified': '2011-03-24 15:58:12',
-		'modified_by': 'Administrator',
-		'name': '000006341',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Workflow Rule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-24 15:58:12',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Action html',
-		'modified': '2011-03-24 15:58:12',
-		'modified_by': 'Administrator',
-		'name': '000006342',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': 'Specify actions to be taken  when conditions hold satisfied',
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Workflow Rule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:45:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'workflow_action_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Workflow Action Details',
-		'modified': '2011-03-24 15:58:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03610',
-		'no_copy': None,
-		'oldfieldname': 'workflow_action_details',
-		'oldfieldtype': 'Table',
-		'options': 'Workflow Action Detail',
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Workflow Rule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-03-24 15:58:12',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': 1,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Reject HTML',
-		'modified': '2011-03-24 15:58:12',
-		'modified_by': 'Administrator',
-		'name': '000006343',
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': "If any condition holds false the following message will be displayed . If you wish to stop rule engine when condition holds false then set 'Raise Exception' as 'Yes' otherwise keep this field blank or 'No'.",
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Workflow Rule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-11-30 17:30:03',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'message',
-		'fieldtype': 'Text',
-		'hidden': 1,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Enter message',
-		'modified': '2011-03-24 15:58:12',
-		'modified_by': 'Administrator',
-		'name': 'FL00549',
-		'no_copy': 1,
-		'oldfieldname': 'message',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Workflow Rule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-11-30 22:45:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'message',
-		'fieldtype': 'Text',
-		'hidden': 1,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Enter message',
-		'modified': '2010-11-30 22:45:39',
-		'modified_by': 'Administrator',
-		'name': 'FL03612',
-		'no_copy': 1,
-		'oldfieldname': 'message',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Workflow Rule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': '',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-11-30 22:45:39',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'raise_exception',
-		'fieldtype': 'Select',
-		'hidden': 1,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Raise Exception',
-		'modified': '2011-03-24 15:58:12',
-		'modified_by': 'Administrator',
-		'name': 'FL03613',
-		'no_copy': 1,
-		'oldfieldname': 'raise_exception',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Workflow Rule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-11-30 22:45:39',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2010-11-30 22:45:39',
-		'modified_by': 'Administrator',
-		'name': 'PERM00660',
-		'owner': 'swarnalata@webnotestech.com',
-		'parent': 'Workflow Rule',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
-		'write': 1
-	}
-]
\ No newline at end of file
diff --git a/settings/doctype/workflow_rule_detail/__init__.py b/settings/doctype/workflow_rule_detail/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/settings/doctype/workflow_rule_detail/workflow_rule_detail.txt b/settings/doctype/workflow_rule_detail/workflow_rule_detail.txt
deleted file mode 100644
index 4b1e4a1b9a..0000000000
--- a/settings/doctype/workflow_rule_detail/workflow_rule_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-11-23 13:38:38', 'search_fields': None, 'module': 'Settings', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'swarnalata@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 9, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Workflow Rule Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-11-23 13:38:38', 'doctype': 'DocField', 'oldfieldname': 'rule_field', 'owner': 'swarnalata@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Field', 'width': '200px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Workflow Rule Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03382', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-03-31 09:44:19', 'parenttype': 'DocType', 'fieldname': 'rule_field', 'fieldtype': 'Select', 'options': '[]', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-11-23 13:38:38', 'doctype': 'DocField', 'oldfieldname': 'operator', 'owner': 'swarnalata@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Operator', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Workflow Rule Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03383', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-03-31 09:44:19', 'parenttype': 'DocType', 'fieldname': 'operator', 'fieldtype': 'Select', 'options': '\nequal\nnot equal\ngreater than\ngreater than equal\nless than\nless than equal', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-23 13:38:38', 'doctype': 'DocField', 'oldfieldname': 'value', 'owner': 'swarnalata@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Value', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Workflow Rule Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03384', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-03-31 09:44:19', 'parenttype': 'DocType', 'fieldname': 'value', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-12-08 11:40:55', 'doctype': 'DocField', 'oldfieldname': 'comparing_field', 'owner': 'swarnalata@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Field from other forms', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Workflow Rule Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03486', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-03-31 09:44:19', 'parenttype': 'DocType', 'fieldname': 'comparing_field', 'fieldtype': 'Select', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-12-07 12:51:48', 'doctype': 'DocField', 'oldfieldname': 'message', 'owner': 'swarnalata@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Message when Cond. False', 'width': '200px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Workflow Rule Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03481', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-03-31 09:44:19', 'parenttype': 'DocType', 'fieldname': 'message', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-12-07 12:51:48', 'doctype': 'DocField', 'oldfieldname': 'exception', 'owner': 'swarnalata@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Raise Exception', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Workflow Rule Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03480', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-03-31 09:44:19', 'parenttype': 'DocType', 'fieldname': 'exception', 'fieldtype': 'Select', 'options': '\nYes\nNo', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/roles/Role/System Manager/System Manager.txt b/setup/Role/System Manager/System Manager.txt
similarity index 100%
rename from roles/Role/System Manager/System Manager.txt
rename to setup/Role/System Manager/System Manager.txt
diff --git a/material_management/search_criteria/stock_level/__init__.py b/setup/doctype/authorization_control/__init__.py
similarity index 100%
rename from material_management/search_criteria/stock_level/__init__.py
rename to setup/doctype/authorization_control/__init__.py
diff --git a/settings/doctype/authorization_control/authorization_control.js b/setup/doctype/authorization_control/authorization_control.js
similarity index 100%
rename from settings/doctype/authorization_control/authorization_control.js
rename to setup/doctype/authorization_control/authorization_control.js
diff --git a/settings/doctype/authorization_control/authorization_control.py b/setup/doctype/authorization_control/authorization_control.py
similarity index 100%
rename from settings/doctype/authorization_control/authorization_control.py
rename to setup/doctype/authorization_control/authorization_control.py
diff --git a/setup/doctype/authorization_control/authorization_control.txt b/setup/doctype/authorization_control/authorization_control.txt
new file mode 100644
index 0000000000..ce07175cd2
--- /dev/null
+++ b/setup/doctype/authorization_control/authorization_control.txt
@@ -0,0 +1,30 @@
+# DocType, Authorization Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:52',
+		'docstatus': 0,
+		'modified': '2010-12-16 23:57:05',
+		'modified_by': 'nabin@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'version': 216
+	},
+
+	# DocType, Authorization Control
+	{
+		'doctype': 'DocType',
+		'name': 'Authorization Control'
+	}
+]
\ No newline at end of file
diff --git a/material_management/search_criteria/stock_report/__init__.py b/setup/doctype/authorization_rule/__init__.py
similarity index 100%
rename from material_management/search_criteria/stock_report/__init__.py
rename to setup/doctype/authorization_rule/__init__.py
diff --git a/settings/doctype/authorization_rule/authorization_rule.js b/setup/doctype/authorization_rule/authorization_rule.js
similarity index 100%
rename from settings/doctype/authorization_rule/authorization_rule.js
rename to setup/doctype/authorization_rule/authorization_rule.js
diff --git a/settings/doctype/authorization_rule/authorization_rule.py b/setup/doctype/authorization_rule/authorization_rule.py
similarity index 100%
rename from settings/doctype/authorization_rule/authorization_rule.py
rename to setup/doctype/authorization_rule/authorization_rule.py
diff --git a/setup/doctype/authorization_rule/authorization_rule.txt b/setup/doctype/authorization_rule/authorization_rule.txt
new file mode 100644
index 0000000000..ef20f3621a
--- /dev/null
+++ b/setup/doctype/authorization_rule/authorization_rule.txt
@@ -0,0 +1,223 @@
+# DocType, Authorization Rule
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:52',
+		'docstatus': 0,
+		'modified': '2010-12-02 18:06:28',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308741898',
+		'allow_trash': 1,
+		'autoname': 'AR.####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Setup',
+		'name': '__common__',
+		'search_fields': 'transaction,based_on,system_user,system_role,approving_user,approving_role',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 58
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Authorization Rule',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Authorization Rule',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocType, Authorization Rule
+	{
+		'doctype': 'DocType',
+		'name': 'Authorization Rule'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'transaction',
+		'fieldtype': 'Select',
+		'idx': 2,
+		'label': 'Transaction',
+		'oldfieldname': 'transaction',
+		'oldfieldtype': 'Select',
+		'options': '\nDelivery Note\nPurchase Invoice\nPurchase Order\nPurchase Receipt\nQuotation\nSales Invoice\nSales Order\nStock Entry\nExpense Voucher\nAppraisal',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'based_on',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Based On',
+		'oldfieldname': 'based_on',
+		'oldfieldtype': 'Select',
+		'options': '\nGrand Total\nAverage Discount\nCustomerwise Discount\nItemwise Discount\nTotal Claimed Amount\nNot Applicable',
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'master_name',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'label': 'Customer / Item Name',
+		'oldfieldname': 'master_name',
+		'oldfieldtype': 'Link',
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'system_role',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'label': 'Applicable To (Role)',
+		'oldfieldname': 'system_role',
+		'oldfieldtype': 'Link',
+		'options': 'Role'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'system_user',
+		'fieldtype': 'Link',
+		'idx': 6,
+		'label': 'Applicable To (User)',
+		'oldfieldname': 'system_user',
+		'oldfieldtype': 'Link',
+		'options': 'Profile'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'This will be used for setting rule in HR module',
+		'doctype': 'DocField',
+		'fieldname': 'to_emp',
+		'fieldtype': 'Link',
+		'idx': 7,
+		'label': 'Applicable To (Employee)',
+		'oldfieldname': 'to_emp',
+		'oldfieldtype': 'Link',
+		'options': 'Employee'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'This will be used for setting rule in HR module',
+		'doctype': 'DocField',
+		'fieldname': 'to_designation',
+		'fieldtype': 'Link',
+		'idx': 8,
+		'label': 'Applicable To (Designation)',
+		'oldfieldname': 'to_designation',
+		'oldfieldtype': 'Link',
+		'options': 'Designation'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'approving_role',
+		'fieldtype': 'Link',
+		'idx': 9,
+		'label': 'Approving Role',
+		'oldfieldname': 'approving_role',
+		'oldfieldtype': 'Link',
+		'options': 'Role'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'approving_user',
+		'fieldtype': 'Link',
+		'idx': 10,
+		'label': 'Approving User',
+		'oldfieldname': 'approving_user',
+		'oldfieldtype': 'Link',
+		'options': 'Profile'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'value',
+		'fieldtype': 'Currency',
+		'idx': 11,
+		'label': 'Above Value',
+		'oldfieldname': 'value',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 12,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text'
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/brand/brand.txt b/setup/doctype/brand/brand.txt
index f7a92d252f..ccf2ca6ae5 100644
--- a/setup/doctype/brand/brand.txt
+++ b/setup/doctype/brand/brand.txt
@@ -1 +1,164 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-05-26 14:59:10', 'search_fields': None, 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 6, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:brand', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Brand', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': '', 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00874', 'parent': 'Brand', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:48:34', 'modified': '2010-09-20 08:57:33', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 1, 'parenttype': 'DocType', 'role': 'Material Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00875', 'parent': 'Brand', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:48:34', 'modified': '2010-09-20 08:57:33', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 2, 'parenttype': 'DocType', 'role': 'Material Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00899', 'parent': 'Brand', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:52:07', 'modified': '2010-09-20 08:57:33', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 3, 'parenttype': 'DocType', 'role': 'Material User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00900', 'parent': 'Brand', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:52:07', 'modified': '2010-09-20 08:57:33', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 4, 'parenttype': 'DocType', 'role': 'Material User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00549', 'parent': 'Brand', 'read': 1, 'create': 1, 'creation': '2009-12-30 12:15:49', 'modified': '2010-09-20 08:57:33', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 5, 'parenttype': 'DocType', 'role': 'Material Master Manager', 'owner': 'saumil@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00302', 'parent': 'Brand', 'read': 1, 'create': 1, 'creation': '2009-05-26 14:59:10', 'modified': '2010-09-20 08:57:33', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 6, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Brand', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04828', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 08:57:33', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-05-26 14:59:10', 'doctype': 'DocField', 'oldfieldname': 'brand', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Brand Name', 'width': '', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Brand', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02186', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 08:57:33', 'parenttype': 'DocType', 'fieldname': 'brand', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-05-26 14:59:10', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Brand', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02187', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-20 08:57:33', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Text', 'options': '', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Brand
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:53',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'yogesh@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:brand',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Setup',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 5
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Brand',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Brand',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Brand
+	{
+		'doctype': 'DocType',
+		'name': 'Brand'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Material Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Material Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Material Master Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'brand',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Brand Name',
+		'oldfieldname': 'brand',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 3,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'width': '300px'
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/company/company.txt b/setup/doctype/company/company.txt
index 598ec29eef..3d2b52ab6e 100644
--- a/setup/doctype/company/company.txt
+++ b/setup/doctype/company/company.txt
@@ -1,919 +1,377 @@
+# DocType, Company
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:55',
+		'docstatus': 0,
+		'modified': '2011-06-30 10:39:58',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
 	{
 		'_last_update': '1309168616',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
 		'allow_trash': 1,
 		'autoname': 'field:company_name',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:55',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocType',
 		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
 		'module': 'Setup',
-		'name': 'Company',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
+		'name': '__common__',
 		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
 		'version': 91
 	},
+
+	# These values are common for all DocField
 	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 1,
-		'creation': '2010-08-08 17:08:55',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'PERM00119',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:08:55',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'PERM00120',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2011-06-29 18:02:47',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'PERM00859',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'All',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-29 17:48:40',
-		'default': None,
-		'depends_on': None,
-		'description': 'Please Enter Company Name and Abbr and save the document. Once saved Accounting Settings will be populated automatically',
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Details',
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL05478',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
+		'name': '__common__',
 		'parent': 'Company',
 		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'parenttype': 'DocType'
 	},
+
+	# These values are common for all DocPerm
+	{
+		'cancel': 0,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Company',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Company
+	{
+		'doctype': 'DocType',
+		'name': 'Company'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'All'
+	},
+
+	# DocField
+	{
+		'description': 'Please Enter Company Name and Abbr and save the document. Once saved Accounting Settings will be populated automatically',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Details',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'company_name',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
-		'in_filter': None,
 		'label': 'Company',
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL00695',
-		'no_column': None,
 		'no_copy': 0,
 		'oldfieldname': 'company_name',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
 		'description': 'Please Enter Abbreviation or Short Name properly as it will be added as Suffix to all Account Heads.',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'abbr',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
-		'in_filter': None,
 		'label': 'Abbr',
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL00696',
-		'no_column': None,
 		'no_copy': 0,
 		'oldfieldname': 'abbr',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'address',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 4,
-		'in_filter': None,
 		'label': 'Address',
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL00697',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'address',
 		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-19 17:40:13',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'default_currency',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 5,
-		'in_filter': None,
 		'label': 'Default Currency',
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': '000003935',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'link:Currency',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-29 17:48:40',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 6,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL05479',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'phone_no',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 7,
-		'in_filter': None,
 		'label': 'Phone No',
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL00699',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'phone_no',
 		'oldfieldtype': 'Data',
 		'options': 'Phone',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'email',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 8,
-		'in_filter': None,
 		'label': 'Email',
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL00700',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'email',
 		'oldfieldtype': 'Data',
 		'options': 'Email',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'fax',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 9,
-		'in_filter': None,
 		'label': 'Fax',
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL00701',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'fax',
 		'oldfieldtype': 'Data',
 		'options': 'Phone',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'website',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 10,
-		'in_filter': None,
 		'label': 'Website',
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL00702',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'website',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-06-29 17:48:40',
-		'default': None,
-		'depends_on': None,
 		'description': 'Company registration numbers for your reference. Example: VAT Registration Numbers etc.',
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 11,
-		'in_filter': None,
 		'label': 'Registration Info',
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL05480',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
 		'description': 'Company registration numbers for your reference. Tax numbers etc.',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'registration_details',
 		'fieldtype': 'Code',
-		'hidden': None,
-		'icon': None,
 		'idx': 12,
-		'in_filter': None,
 		'label': 'Registration Details',
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL00704',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'registration_details',
 		'oldfieldtype': 'Code',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-29 17:48:40',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 13,
-		'in_filter': None,
 		'label': 'Accounting Settings',
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL05481',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'default_bank_account',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 14,
-		'in_filter': None,
 		'label': 'Default Bank Account',
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL00706',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'default_bank_account',
 		'oldfieldtype': 'Link',
 		'options': 'Account',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'receivables_group',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 15,
-		'in_filter': None,
 		'label': 'Receivables Group',
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL00707',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'receivables_group',
 		'oldfieldtype': 'Link',
 		'options': 'Account',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'payables_group',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 16,
-		'in_filter': None,
 		'label': 'Payables Group',
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL00708',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'payables_group',
 		'oldfieldtype': 'Link',
 		'options': 'Account',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-29 17:48:40',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 17,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL05482',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'yearly_bgt_flag',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 18,
-		'in_filter': None,
 		'label': 'If Yearly Budget Exceeded',
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL00710',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'yearly_bgt_flag',
 		'oldfieldtype': 'Select',
 		'options': '\nWarn\nIgnore\nStop',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'monthly_bgt_flag',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 19,
-		'in_filter': None,
 		'label': 'If Monthly Budget Exceeded',
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL00711',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'monthly_bgt_flag',
 		'oldfieldtype': 'Select',
 		'options': '\nWarn\nIgnore\nStop',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'credit_days',
 		'fieldtype': 'Int',
-		'hidden': None,
-		'icon': None,
 		'idx': 20,
-		'in_filter': None,
 		'label': 'Credit Days',
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL00712',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'credit_days',
 		'oldfieldtype': 'Int',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'credit_limit',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 21,
-		'in_filter': None,
 		'label': 'Credit Limit',
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL00713',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'credit_limit',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'trash_reason',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 22,
-		'in_filter': None,
 		'label': 'Trash Reason',
-		'modified': '2011-06-29 18:02:47',
-		'modified_by': 'Administrator',
-		'name': 'FL00716',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'trash_reason',
 		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	}
 ]
\ No newline at end of file
diff --git a/setup/doctype/contact_control/contact_control.txt b/setup/doctype/contact_control/contact_control.txt
index f57d7cf3e4..b9e84ad436 100644
--- a/setup/doctype/contact_control/contact_control.txt
+++ b/setup/doctype/contact_control/contact_control.txt
@@ -1 +1,88 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-07-23 13:32:22', 'search_fields': None, 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 1, 'read_only': 1, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 25, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Contact Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00411', 'parent': 'Contact Control', 'read': 1, 'create': 0, 'creation': '2009-09-09 12:17:33', 'modified': '2010-08-06 22:02:45', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-09-09 12:13:02', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Header', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Contact Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02926', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-08-06 22:02:45', 'parenttype': 'DocType', 'fieldname': 'header', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-09-09 12:13:01', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Customer Intro', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Contact Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02924', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-08-06 22:02:45', 'parenttype': 'DocType', 'fieldname': 'customer_intro', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-09-09 12:13:02', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Supplier Intro', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Contact Control', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02925', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-08-06 22:02:45', 'parenttype': 'DocType', 'fieldname': 'supplier_intro', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Contact Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:56',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'yogesh@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 1,
+		'issingle': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'read_only': 1,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 25
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Text',
+		'name': '__common__',
+		'parent': 'Contact Control',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'Contact Control',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocType, Contact Control
+	{
+		'doctype': 'DocType',
+		'name': 'Contact Control'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'header',
+		'idx': 1,
+		'label': 'Header'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_intro',
+		'idx': 2,
+		'label': 'Customer Intro'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'supplier_intro',
+		'idx': 3,
+		'label': 'Supplier Intro'
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/country/country.txt b/setup/doctype/country/country.txt
index ddf0dbd0be..089ceb35b3 100644
--- a/setup/doctype/country/country.txt
+++ b/setup/doctype/country/country.txt
@@ -1 +1,100 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-04-24 10:15:27', 'search_fields': '', 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 0, 'read_only': 0, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 12, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'field:country_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Country', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': '', 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00501', 'parent': 'Country', 'read': 1, 'create': 1, 'creation': '2009-11-04 16:20:24', 'modified': '2010-09-20 09:22:06', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Sales Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00765', 'parent': 'Country', 'read': 1, 'create': 1, 'creation': '2010-04-08 14:09:38', 'modified': '2010-09-20 09:22:06', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'Purchase Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00829', 'parent': 'Country', 'read': 1, 'create': 1, 'creation': '2010-04-19 10:03:22', 'modified': '2010-09-20 09:22:06', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'HR User', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00830', 'parent': 'Country', 'read': 1, 'create': 1, 'creation': '2010-04-19 10:03:22', 'modified': '2010-09-20 09:22:06', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 4, 'parenttype': 'DocType', 'role': 'HR Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-04-24 10:15:27', 'doctype': 'DocField', 'oldfieldname': 'country_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Country Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Country', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01929', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 09:22:06', 'parenttype': 'DocType', 'fieldname': 'country_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Country
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:56',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'yogesh@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'field:country_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'in_create': 0,
+		'module': 'Setup',
+		'name': '__common__',
+		'read_only': 0,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 11
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'country_name',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Country Name',
+		'name': '__common__',
+		'oldfieldname': 'country_name',
+		'oldfieldtype': 'Data',
+		'parent': 'Country',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Country',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'write': 1
+	},
+
+	# DocType, Country
+	{
+		'doctype': 'DocType',
+		'name': 'Country'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'Sales Master Manager',
+		'submit': 0
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'Purchase Master Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'role': 'HR User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'role': 'HR Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField'
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/currency/currency.txt b/setup/doctype/currency/currency.txt
index 25c8c39e60..d5d066cfea 100644
--- a/setup/doctype/currency/currency.txt
+++ b/setup/doctype/currency/currency.txt
@@ -1 +1,95 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-25 10:32:06', 'search_fields': None, 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 0, 'read_only': 0, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 4, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'field:currency_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': '', 'name': 'Currency', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-11-18 16:00:32', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00294', 'parent': 'Currency', 'read': 1, 'create': 1, 'creation': '2009-05-18 12:54:45', 'modified': '2010-11-18 16:00:32', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Accounts Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00247', 'parent': 'Currency', 'read': 1, 'create': 1, 'creation': '2009-03-25 10:32:06', 'modified': '2010-11-18 16:00:32', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'Sales Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00248', 'parent': 'Currency', 'read': 1, 'create': 1, 'creation': '2009-03-25 10:32:06', 'modified': '2010-11-18 16:00:32', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'Purchase Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM01235', 'parent': 'Currency', 'read': 1, 'create': 1, 'creation': '2010-11-18 16:00:32', 'modified': '2010-11-18 16:00:32', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 4, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'saumil@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-25 10:32:06', 'doctype': 'DocField', 'oldfieldname': 'currency_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Currency Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Currency', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01465', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-11-18 16:00:32', 'parenttype': 'DocType', 'fieldname': 'currency_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Currency
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:56',
+		'docstatus': 0,
+		'modified': '2010-11-18 16:00:32',
+		'modified_by': 'yogesh@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'field:currency_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 0,
+		'module': 'Setup',
+		'name': '__common__',
+		'read_only': 0,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 3
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'currency_name',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Currency Name',
+		'name': '__common__',
+		'oldfieldname': 'currency_name',
+		'oldfieldtype': 'Data',
+		'parent': 'Currency',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Currency',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'write': 1
+	},
+
+	# DocType, Currency
+	{
+		'doctype': 'DocType',
+		'name': 'Currency'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'Accounts Manager'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'Sales Master Manager',
+		'submit': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'role': 'Purchase Master Manager',
+		'submit': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField'
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/customer_group/customer_group.txt b/setup/doctype/customer_group/customer_group.txt
index 989626c82c..6cffdd192e 100644
--- a/setup/doctype/customer_group/customer_group.txt
+++ b/setup/doctype/customer_group/customer_group.txt
@@ -1 +1,243 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-12 12:09:56', 'search_fields': 'name,parent_customer_group', 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': 1, 'in_create': 1, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 35, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:customer_group_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Customer Group', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00938', 'parent': 'Customer Group', 'read': 1, 'create': 0, 'creation': '2010-04-26 17:08:32', 'modified': '2010-09-17 14:57:03', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 1, 'parenttype': 'DocType', 'role': 'Sales Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00939', 'parent': 'Customer Group', 'read': 1, 'create': 0, 'creation': '2010-04-26 17:08:32', 'modified': '2010-09-17 14:57:03', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 2, 'parenttype': 'DocType', 'role': 'Sales Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00955', 'parent': 'Customer Group', 'read': 1, 'create': 0, 'creation': '2010-04-26 17:10:54', 'modified': '2010-09-17 14:57:03', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 3, 'parenttype': 'DocType', 'role': 'Sales Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00971', 'parent': 'Customer Group', 'read': 1, 'create': 0, 'creation': '2010-04-26 17:13:26', 'modified': '2010-09-17 14:57:03', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 4, 'parenttype': 'DocType', 'role': 'Sales User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00972', 'parent': 'Customer Group', 'read': 1, 'create': 0, 'creation': '2010-04-26 17:13:26', 'modified': '2010-09-17 14:57:03', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 5, 'parenttype': 'DocType', 'role': 'Sales User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00163', 'parent': 'Customer Group', 'read': 1, 'create': 1, 'creation': '2009-03-12 14:13:07', 'modified': '2010-09-17 14:57:03', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 6, 'parenttype': 'DocType', 'role': 'Sales Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': '', 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Customer Group', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04837', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-17 14:57:03', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:56', 'doctype': 'DocField', 'oldfieldname': 'customer_group_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Customer Group Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Customer Group', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00768', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-17 14:57:03', 'parenttype': 'DocType', 'fieldname': 'customer_group_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-03-12 12:09:56', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Customer Group', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00769', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-17 14:57:03', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-06-24 09:32:40', 'doctype': 'DocField', 'oldfieldname': 'parent_customer_group', 'owner': 'nabin@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Parent Customer Group', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Customer Group', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05420', 'idx': 4, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-17 14:57:03', 'parenttype': 'DocType', 'fieldname': 'parent_customer_group', 'fieldtype': 'Link', 'options': 'Customer Group', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-06-30 10:32:15', 'doctype': 'DocField', 'oldfieldname': 'is_group', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Has Child Node', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Only leaf nodes are allowed in transaction', 'parent': 'Customer Group', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05496', 'idx': 5, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-17 14:57:03', 'parenttype': 'DocType', 'fieldname': 'is_group', 'fieldtype': 'Select', 'options': '\nYes\nNo', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Int', 'creation': '2010-06-30 09:55:32', 'doctype': 'DocField', 'oldfieldname': 'lft', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'ashwini@webnotestech.com', 'label': 'lft', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Customer Group', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL05493', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-09-17 14:57:03', 'parenttype': 'DocType', 'fieldname': 'lft', 'fieldtype': 'Int', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Int', 'creation': '2010-06-30 09:55:32', 'doctype': 'DocField', 'oldfieldname': 'rgt', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'ashwini@webnotestech.com', 'label': 'rgt', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Customer Group', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL05494', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-09-17 14:57:03', 'parenttype': 'DocType', 'fieldname': 'rgt', 'fieldtype': 'Int', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2010-06-30 09:55:32', 'doctype': 'DocField', 'oldfieldname': 'old_parent', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'ashwini@webnotestech.com', 'label': 'old_parent', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Customer Group', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05495', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-09-17 14:57:03', 'parenttype': 'DocType', 'fieldname': 'old_parent', 'fieldtype': 'Data', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Customer Group
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:57',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'yogesh@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:customer_group_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'in_create': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'search_fields': 'name,parent_customer_group',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 33
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Customer Group',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'amend': 0,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Customer Group',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'submit': 0
+	},
+
+	# DocType, Customer Group
+	{
+		'doctype': 'DocType',
+		'name': 'Customer Group'
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Sales Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Sales Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Sales Master Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'Sales User',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Sales User',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 0,
+		'role': 'Sales Master Manager',
+		'write': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_group_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Customer Group Name',
+		'no_copy': 1,
+		'oldfieldname': 'customer_group_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 3,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'parent_customer_group',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'label': 'Parent Customer Group',
+		'oldfieldname': 'parent_customer_group',
+		'oldfieldtype': 'Link',
+		'options': 'Customer Group',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Only leaf nodes are allowed in transaction',
+		'doctype': 'DocField',
+		'fieldname': 'is_group',
+		'fieldtype': 'Select',
+		'idx': 5,
+		'label': 'Has Child Node',
+		'oldfieldname': 'is_group',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'lft',
+		'fieldtype': 'Int',
+		'hidden': 1,
+		'idx': 6,
+		'label': 'lft',
+		'no_copy': 1,
+		'oldfieldname': 'lft',
+		'oldfieldtype': 'Int',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rgt',
+		'fieldtype': 'Int',
+		'hidden': 1,
+		'idx': 7,
+		'label': 'rgt',
+		'no_copy': 1,
+		'oldfieldname': 'rgt',
+		'oldfieldtype': 'Int',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'old_parent',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 8,
+		'label': 'old_parent',
+		'no_copy': 1,
+		'oldfieldname': 'old_parent',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/payroll/__init__.py b/setup/doctype/email_settings/__init__.py
similarity index 100%
rename from payroll/__init__.py
rename to setup/doctype/email_settings/__init__.py
diff --git a/settings/doctype/email_settings/email_settings.js b/setup/doctype/email_settings/email_settings.js
similarity index 100%
rename from settings/doctype/email_settings/email_settings.js
rename to setup/doctype/email_settings/email_settings.js
diff --git a/settings/doctype/email_settings/email_settings.py b/setup/doctype/email_settings/email_settings.py
similarity index 100%
rename from settings/doctype/email_settings/email_settings.py
rename to setup/doctype/email_settings/email_settings.py
diff --git a/setup/doctype/email_settings/email_settings.txt b/setup/doctype/email_settings/email_settings.txt
new file mode 100644
index 0000000000..31bc93285f
--- /dev/null
+++ b/setup/doctype/email_settings/email_settings.txt
@@ -0,0 +1,125 @@
+# DocType, Email Settings
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:59',
+		'docstatus': 0,
+		'modified': '2011-01-04 11:21:25',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1307707462',
+		'allow_copy': 1,
+		'allow_email': 1,
+		'allow_print': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 1,
+		'issingle': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 27
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Email Settings',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Email Settings',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocType, Email Settings
+	{
+		'doctype': 'DocType',
+		'name': 'Email Settings'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'outgoing_mail_server',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Outgoing Mail Server'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'mail_port',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Mail Port'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'use_ssl',
+		'fieldtype': 'Check',
+		'idx': 3,
+		'label': 'Use SSL'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'mail_login',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'Login Id'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'mail_password',
+		'fieldtype': 'Password',
+		'idx': 5,
+		'label': 'Mail Password'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'auto_email_id',
+		'fieldtype': 'Data',
+		'idx': 6,
+		'label': 'Auto Email Id'
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/erp_setup/__init__.py b/setup/doctype/erp_setup/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/setup/doctype/erp_setup/erp_setup.js b/setup/doctype/erp_setup/erp_setup.js
deleted file mode 100644
index 61fd374add..0000000000
--- a/setup/doctype/erp_setup/erp_setup.js
+++ /dev/null
@@ -1,3 +0,0 @@
-cur_frm.cscript['Repost GL'] = function(doc,dt,dn) {
-  $c_obj('GL Control','repost_gl','',function(r,rt) {alert('Done')});
-}
\ No newline at end of file
diff --git a/setup/doctype/erp_setup/erp_setup.py b/setup/doctype/erp_setup/erp_setup.py
deleted file mode 100644
index b0f1474048..0000000000
--- a/setup/doctype/erp_setup/erp_setup.py
+++ /dev/null
@@ -1,131 +0,0 @@
-# Please edit this list and import only required elements
-import webnotes
-
-from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
-from webnotes.model import db_exists
-from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType
-from webnotes.model.doclist import getlist, copy_doclist
-from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
-from webnotes import session, form, is_testing, msgprint, errprint
-
-set = webnotes.conn.set
-sql = webnotes.conn.sql
-get_value = webnotes.conn.get_value
-in_transaction = webnotes.conn.in_transaction
-convert_to_lists = webnotes.conn.convert_to_lists
-	
-# -----------------------------------------------------------------------------------------
-
-
-class DocType:
-  def __init__(self, d, dl):
-    self.doc, self.doclist = d, dl
-
-  def get_bal(self,arg):
-    bal = sql("select `tabAccount Balance`.balance,`tabAccount`.debit_or_credit from `tabAccount`,`tabAccount Balance` where `tabAccount Balance`.account=%s and `tabAccount Balance`.period=%s and `tabAccount Balance`.account=`tabAccount`.name ",(arg,self.doc.current_fiscal_year))
-    if bal:
-      return fmt_money(flt(bal[0][0])) + ' ' + bal[0][1]
-    else:
-      return ''
-  
-  def get_series(self):
-    self.doc.clear_table(self.doclist, 'series_details')
-    
-    if self.doc.select_doctype:
-      sr= sql("Select options from `tabDocField` where fieldname='voucher_series' and parent='%s'"%(self.doc.select_doctype))
-      if sr:
-        sr_list=sr[0][0].split("\n")
-        
-        for x in sr_list:
-          if cstr(x)!='':
-            c = addchild(self.doc, 'series_details', 'Series Detail', 1, self.doclist)
-            c.series=cstr(x)
-      
-      else:
-        msgprint("No series is mentioned")
-    else :
-      msgprint("Please select Doctype")
-  
-  def remove_series(self):
-    if not getlist(self.doclist, 'series_details'):
-      msgprint("Please pull already existed series for the selected doctype and check the series that you want to remove")
-    else:
-      sr= sql("Select options from `tabDocField` where fieldname='voucher_series' and parent='%s'"%(self.doc.select_doctype))
-      if sr:
-        sr_list=sr[0][0].split("\n")
-      
-      for d in getlist(self.doclist, 'series_details'):
-        if d.remove == 1:
-          sr_list.remove(d.series)
-      sql("update `tabDocField` set options='%s' where fieldname='voucher_series' and parent='%s'"%("\n".join(sr_list),self.doc.select_doctype))
-      self.get_series()
-
-  def add_series(self):
-    if not self.doc.select_doctype or not self.doc.new_series:
-      msgprint("Please select Doctype and series name for which series will be added")
-      raise Exception
-    else:
-      sr_list = []
-      sr= sql("select options from `tabDocField` where fieldname='voucher_series' and parent='%s'"% (self.doc.select_doctype))
-      if sr[0][0]:
-        sr_list=sr[0][0].split("\n")
-      self.check_duplicate()
-      if not sr_list:
-        sr_list.append('')
-        sr_list.append(self.get_new_series())
-      else:
-        sr_list.append(self.get_new_series())
-      sql("update `tabDocField` set options='%s' where fieldname='voucher_series' and parent='%s'"%("\n".join(sr_list),self.doc.select_doctype))
-      self.get_series()
-      
-  def check_duplicate(self):
-    sr_list = sql("Select options from `tabDocField` where fieldname='voucher_series' group by parent")
-    nw_sr = self.get_new_series()
-    #msgprint(sr_list)
-    for sr in sr_list:
-      if nw_sr in sr[0]:
-        idx=sql("Select current from `tabSeries` where name='%s'"% (nw_sr + '/'))
-        msgprint("Series name already exist with index '%s'" %(idx[0][0]))
-        raise Exception  
-        
-  def get_new_series(self):
-    if 'FY' in cstr((self.doc.new_series).upper()):
-      abb=sql("select abbreviation from `tabFiscal Year` where name='%s'"%(self.doc.current_fiscal_year))
-      if not abb:
-        msgprint("Abbreviation is not mentioned in Fiscal Year")
-        raise Exception
-      else:
-        return cstr((self.doc.new_series).upper()).strip().replace('FY',abb[0][0])
-    else:
-      return cstr((self.doc.new_series).upper()).strip()
-
-  def on_update(self):
-
-    # fiscal year
-    set_default('fiscal_year', self.doc.current_fiscal_year)
-    ysd = sql("select year_start_date from `tabFiscal Year` where name=%s", self.doc.current_fiscal_year, as_dict = 1)
-    set_default('year_start_date', ysd[0]['year_start_date'].strftime('%Y-%m-%d'))
-    set_default('year_end_date', get_last_day(get_first_day(ysd[0]['year_start_date'],0,11)).strftime('%Y-%m-%d'))
-
-    # company
-    set_default('company', self.doc.default_company)
-
-    set_default('stock_valuation', self.doc.stock_valuation or 'Moving Average')
-    set_default('default_currency', self.doc.default_currency or 'INR')
-
-    # Purchase in transit
-    if self.doc.purchase_in_transit_account:
-      set_default('purchase_in_transit_account', self.doc.purchase_in_transit_account)
-  
-  def get_default_bank_account(self, company):
-    return sql("select default_bank_account from tabCompany where name = '%s'" % company)[0][0]
-
-  def get_bank_defaults(self, arg):
-    arg = eval(arg)
-    return {
-      'def_bv_type': self.doc.default_bank_voucher_type or '',
-      'def_bv_series': self.doc.default_bank_voucher_series or '',
-      'def_bank_account': self.get_default_bank_account(arg['company']) or '',
-      'bank_balance': self.get_bal(self.get_default_bank_account(arg['company'])) or 0.0,
-      'acc_balance': self.get_bal(arg['credit_to']) or 0.0
-    }
diff --git a/setup/doctype/erp_setup/erp_setup.txt b/setup/doctype/erp_setup/erp_setup.txt
deleted file mode 100644
index fc7c14f7b6..0000000000
--- a/setup/doctype/erp_setup/erp_setup.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-03-12 12:04:08', 'search_fields': None, 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': 1, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 97, 'menu_index': None, 'docstatus': 0, 'allow_copy': 1, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': 1, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'nabin@webnotestech.com', 'document_type': None, 'name': 'ERP Setup', 'idx': None, 'hide_toolbar': 0, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM00148', 'parent': 'ERP Setup', 'read': 1, 'create': 1, 'creation': '2009-03-12 14:03:17', 'modified': '2010-08-08 15:21:42', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'System Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': '', 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM00023', 'parent': 'ERP Setup', 'read': 1, 'create': 1, 'creation': '2009-03-12 12:04:08', 'modified': '2010-08-08 15:21:42', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'PERM00321', 'parent': 'ERP Setup', 'read': 1, 'create': None, 'creation': '2009-06-22 12:28:39', 'modified': '2010-08-08 15:21:42', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 3, 'parenttype': 'DocType', 'role': 'All', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 12:04:08', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Accounts', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ERP Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00242', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-08-08 15:21:42', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 12:04:08', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Default Company', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ERP Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00243', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-08-08 15:21:42', 'parenttype': 'DocType', 'fieldname': 'default_company', 'fieldtype': 'Link', 'options': 'Company', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 12:04:08', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Current Fiscal Year', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ERP Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00244', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-08-08 15:21:42', 'parenttype': 'DocType', 'fieldname': 'current_fiscal_year', 'fieldtype': 'Link', 'options': 'Fiscal Year', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 12:04:08', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Default Bank Account', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ERP Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00245', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-08-08 15:21:42', 'parenttype': 'DocType', 'fieldname': 'default_bank_account', 'fieldtype': 'Link', 'options': 'Account', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 12:04:08', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Default Bank Voucher Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ERP Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00246', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-08-08 15:21:42', 'parenttype': 'DocType', 'fieldname': 'default_bank_voucher_type', 'fieldtype': 'Select', 'options': 'Bank Voucher\nCash Voucher\nJournal Entry\nCredit Note\nDebit Note\nCredit Card Voucher\nSalary Voucher', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 12:04:08', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Default Bank Voucher Series', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ERP Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00247', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-08-08 15:21:42', 'parenttype': 'DocType', 'fieldname': 'default_bank_voucher_series', 'fieldtype': 'Select', 'options': 'BV/08-09/\nCV/08-09/\nJV/08-09/\nCN/08-09/\nDN/08-09/\nCC/08-09/\nSV/08-09/', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 12:04:08', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Default Currency', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ERP Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00248', 'idx': 7, 'default': 'INR', 'colour': None, 'modified': '2010-08-08 15:21:42', 'parenttype': 'DocType', 'fieldname': 'default_currency', 'fieldtype': 'Select', 'options': 'link:Currency', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 12:04:08', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Stock Valuation', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ERP Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00249', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-08-08 15:21:42', 'parenttype': 'DocType', 'fieldname': 'stock_valuation', 'fieldtype': 'Select', 'options': 'Moving Average\nFCFS', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 12:04:08', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Repost GL', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'ERP Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00250', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-08-08 15:21:42', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 12:04:08', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': '', 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ERP Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00251', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-08-08 15:21:42', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-06-12 16:42:30', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Naming Series', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ERP Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02322', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-08-08 15:21:42', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-06-12 16:42:30', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Select Doctype', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ERP Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02323', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-08-08 15:21:42', 'parenttype': 'DocType', 'fieldname': 'select_doctype', 'fieldtype': 'Link', 'options': 'DocType', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-06-12 16:42:30', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Get Series', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ERP Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02324', 'idx': 13, 'default': None, 'colour': None, 'modified': '2010-08-08 15:21:42', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'get_series', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-06-12 17:11:58', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Series Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'ERP Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02332', 'idx': 14, 'default': None, 'colour': None, 'modified': '2010-08-08 15:21:42', 'parenttype': 'DocType', 'fieldname': 'series_details', 'fieldtype': 'Table', 'options': 'Series Detail', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-06-12 16:42:30', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Update Series', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ERP Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02325', 'idx': 15, 'default': None, 'colour': None, 'modified': '2010-08-08 15:21:42', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'remove_series', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-06-12 16:42:30', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Add New Series', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ERP Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02326', 'idx': 16, 'default': None, 'colour': None, 'modified': '2010-08-08 15:21:42', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': 'Simple', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-06-12 16:42:30', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'New Series', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ERP Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02327', 'idx': 17, 'default': None, 'colour': None, 'modified': '2010-08-08 15:21:42', 'parenttype': 'DocType', 'fieldname': 'new_series', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-06-12 16:42:30', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Add Series', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ERP Setup', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02328', 'idx': 18, 'default': None, 'colour': None, 'modified': '2010-08-08 15:21:42', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'add_series', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/setup/doctype/import_data_control/import_data_control.txt b/setup/doctype/import_data_control/import_data_control.txt
index 6099670bfb..06787e0f6a 100644
--- a/setup/doctype/import_data_control/import_data_control.txt
+++ b/setup/doctype/import_data_control/import_data_control.txt
@@ -1 +1,30 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-09-17 16:54:59', 'search_fields': None, 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'harshada@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 13, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': '', 'name': 'Import Data Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-10-14 12:26:41', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
+# DocType, Import Data Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-10-04 16:30:30',
+		'docstatus': 0,
+		'modified': '2010-12-24 11:43:03',
+		'modified_by': 'abhishek@webnotestech.com',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 12
+	},
+
+	# DocType, Import Data Control
+	{
+		'doctype': 'DocType',
+		'name': 'Import Data Control'
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/item_group/item_group.txt b/setup/doctype/item_group/item_group.txt
index f54679b183..d2604fd376 100644
--- a/setup/doctype/item_group/item_group.txt
+++ b/setup/doctype/item_group/item_group.txt
@@ -1 +1,262 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-12 12:09:42', 'search_fields': 'parent_item_group', 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 1, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 0, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 57, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:item_group_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Item Group', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00876', 'parent': 'Item Group', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:48:34', 'modified': '2010-09-20 09:45:17', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 1, 'parenttype': 'DocType', 'role': 'Material Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00877', 'parent': 'Item Group', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:48:34', 'modified': '2010-09-20 09:45:17', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 2, 'parenttype': 'DocType', 'role': 'Material Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00901', 'parent': 'Item Group', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:52:07', 'modified': '2010-09-20 09:45:17', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 3, 'parenttype': 'DocType', 'role': 'Material User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00902', 'parent': 'Item Group', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:52:07', 'modified': '2010-09-20 09:45:17', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 4, 'parenttype': 'DocType', 'role': 'Material User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00373', 'parent': 'Item Group', 'read': 1, 'create': 1, 'creation': '2009-08-25 17:00:42', 'modified': '2010-09-20 09:45:17', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 5, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00557', 'parent': 'Item Group', 'read': 1, 'create': 1, 'creation': '2009-12-31 12:21:10', 'modified': '2010-09-20 09:45:17', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 6, 'parenttype': 'DocType', 'role': 'Material Master Manager', 'owner': 'saumil@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Item Group', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04850', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 09:45:17', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:42', 'doctype': 'DocField', 'oldfieldname': 'item_group_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Item Group Name', 'width': '', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Item Group', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00610', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 09:45:17', 'parenttype': 'DocType', 'fieldname': 'item_group_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Check', 'creation': '2009-09-10 12:08:39', 'doctype': 'DocField', 'oldfieldname': 'show_in_catalogue', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Show in catalogue', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Item Group', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02931', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-20 09:45:17', 'parenttype': 'DocType', 'fieldname': 'show_in_catalogue', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-03-26 17:09:28', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Item Group', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01479', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-09-20 09:45:17', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Text', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-06-16 10:38:12', 'doctype': 'DocField', 'oldfieldname': 'parent_item_group', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Parent Item Group', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Item Group', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05372', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-09-20 09:45:17', 'parenttype': 'DocType', 'fieldname': 'parent_item_group', 'fieldtype': 'Link', 'options': 'Item Group', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-06-17 09:19:13', 'doctype': 'DocField', 'oldfieldname': 'is_group', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Has Child Node', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Only leaf nodes are allowed in transaction', 'parent': 'Item Group', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05385', 'idx': 6, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-20 09:45:17', 'parenttype': 'DocType', 'fieldname': 'is_group', 'fieldtype': 'Select', 'options': '\nYes\nNo', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Int', 'creation': '2010-06-16 10:38:12', 'doctype': 'DocField', 'oldfieldname': 'lft', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'ashwini@webnotestech.com', 'label': 'lft', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Item Group', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL05376', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-09-20 09:45:17', 'parenttype': 'DocType', 'fieldname': 'lft', 'fieldtype': 'Int', 'options': None, 'report_hide': 0, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Int', 'creation': '2010-06-16 10:38:12', 'doctype': 'DocField', 'oldfieldname': 'rgt', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'ashwini@webnotestech.com', 'label': 'rgt', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Item Group', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL05377', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-09-20 09:45:17', 'parenttype': 'DocType', 'fieldname': 'rgt', 'fieldtype': 'Int', 'options': None, 'report_hide': 0, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2010-06-16 10:38:12', 'doctype': 'DocField', 'oldfieldname': 'old_parent', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'ashwini@webnotestech.com', 'label': 'old_parent', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Item Group', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05378', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-09-20 09:45:17', 'parenttype': 'DocType', 'fieldname': 'old_parent', 'fieldtype': 'Data', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Item Group
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:06',
+		'docstatus': 0,
+		'modified': '2010-12-24 11:58:29',
+		'modified_by': 'abhishek@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:item_group_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'in_create': 1,
+		'issingle': 0,
+		'module': 'Setup',
+		'name': '__common__',
+		'search_fields': 'parent_item_group',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 54
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Item Group',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Item Group',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Item Group
+	{
+		'doctype': 'DocType',
+		'name': 'Item Group'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Material Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Material Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 0,
+		'role': 'Material Master Manager',
+		'write': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_group_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Item Group Name',
+		'oldfieldname': 'item_group_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'show_in_catalogue',
+		'fieldtype': 'Check',
+		'idx': 3,
+		'label': 'Show in catalogue',
+		'oldfieldname': 'show_in_catalogue',
+		'oldfieldtype': 'Check',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 4,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'parent_item_group',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'label': 'Parent Item Group',
+		'oldfieldname': 'parent_item_group',
+		'oldfieldtype': 'Link',
+		'options': 'Item Group',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Only leaf nodes are allowed in transaction',
+		'doctype': 'DocField',
+		'fieldname': 'is_group',
+		'fieldtype': 'Select',
+		'idx': 6,
+		'label': 'Has Child Node',
+		'oldfieldname': 'is_group',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'lft',
+		'fieldtype': 'Int',
+		'hidden': 1,
+		'idx': 7,
+		'in_filter': 1,
+		'label': 'lft',
+		'no_copy': 1,
+		'oldfieldname': 'lft',
+		'oldfieldtype': 'Int',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rgt',
+		'fieldtype': 'Int',
+		'hidden': 1,
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'rgt',
+		'no_copy': 1,
+		'oldfieldname': 'rgt',
+		'oldfieldtype': 'Int',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'old_parent',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 9,
+		'label': 'old_parent',
+		'no_copy': 1,
+		'oldfieldname': 'old_parent',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/manage_account/manage_account.txt b/setup/doctype/manage_account/manage_account.txt
index 0332d6b2cf..26b4e638e0 100644
--- a/setup/doctype/manage_account/manage_account.txt
+++ b/setup/doctype/manage_account/manage_account.txt
@@ -1,1686 +1,526 @@
+# DocType, Manage Account
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': '1305783824',
-		'_user_tags': None,
-		'allow_attach': None,
+		'creation': '2010-08-08 17:09:09',
+		'docstatus': 0,
+		'modified': '2011-05-19 11:16:11',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308741898',
 		'allow_copy': 1,
 		'allow_email': 1,
 		'allow_print': 1,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:09',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
 		'hide_toolbar': 0,
-		'idx': None,
 		'in_create': 1,
-		'in_dialog': None,
-		'is_transaction_doc': None,
 		'issingle': 1,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-19 11:16:11',
-		'modified_by': 'Guest',
 		'module': 'Setup',
-		'name': 'Manage Account',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
+		'name': '__common__',
 		'read_only': 1,
-		'read_only_onload': None,
-		'search_fields': None,
 		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 1,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
 		'version': 514
 	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Manage Account',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Manage Account',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Manage Account
+	{
+		'doctype': 'DocType',
+		'name': 'Manage Account'
+	},
+
+	# DocPerm
 	{
 		'amend': 0,
 		'cancel': 0,
 		'create': 1,
-		'creation': '2010-08-08 17:09:09',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 1,
-		'match': '',
-		'modified': '2010-08-25 12:12:09',
-		'modified_by': 'nabin@webnotestech.com',
-		'name': 'PERM00348',
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'read': 1,
 		'role': 'System Manager',
 		'submit': 0,
 		'write': 1
 	},
+
+	# DocPerm
 	{
-		'amend': None,
-		'cancel': None,
 		'create': 1,
-		'creation': '2010-08-08 17:09:09',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 2,
-		'match': None,
-		'modified': '2010-08-25 12:12:09',
-		'modified_by': 'nabin@webnotestech.com',
-		'name': 'PERM00349',
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
+		'role': 'System Manager',
 		'write': 1
 	},
+
+	# DocPerm
 	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:09',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 3,
-		'match': None,
-		'modified': '2010-08-25 12:12:09',
-		'modified_by': 'nabin@webnotestech.com',
-		'name': 'PERM00350',
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
+		'role': 'System Manager',
 		'write': 1
 	},
+
+	# DocPerm
 	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:09',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 4,
-		'match': None,
-		'modified': '2010-08-25 12:12:09',
-		'modified_by': 'nabin@webnotestech.com',
-		'name': 'PERM00351',
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'read': 1,
-		'role': 'All',
-		'submit': None,
-		'write': None
+		'role': 'All'
 	},
+
+	# DocPerm
 	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:09',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 5,
-		'match': None,
-		'modified': '2010-08-25 12:12:09',
-		'modified_by': 'nabin@webnotestech.com',
-		'name': 'PERM00352',
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 2,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
+		'role': 'System Manager',
 		'write': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 1,
-		'in_filter': None,
-		'label': 'Company',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL05014',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Company'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'default_company',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
-		'in_filter': None,
 		'label': 'Default Company',
-		'modified': '2011-05-25 12:44:24',
-		'modified_by': 'Guest',
-		'name': 'FL01956',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'Company',
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'current_fiscal_year',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
-		'in_filter': None,
 		'label': 'Current Fiscal Year',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01957',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'date_format',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 4,
-		'in_filter': None,
 		'label': 'Date Format',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01958',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'yyyy-mm-dd\ndd-mm-yyyy\ndd/mm/yyyy\nmm/dd/yyyy\nmm-dd-yyyy',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'yyyy-mm-dd\ndd-mm-yyyy\ndd/mm/yyyy\nmm/dd/yyyy\nmm-dd-yyyy'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 5,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL05015',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
 		'default': 'INR',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'default_currency',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 6,
-		'in_filter': None,
 		'label': 'Default Currency',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01960',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'link:Currency',
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'default_currency_format',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 7,
-		'in_filter': None,
 		'label': 'Default Currency Format',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01961',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Lacs\nMillions',
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'Lacs\nMillions'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-14 11:58:00',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'default_currency_fraction',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 8,
-		'in_filter': None,
-		'label': 'Default Currency Fraction',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': '000002366',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Default Currency Fraction'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-12-31 17:48:36',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'sms_sender_name',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 9,
-		'in_filter': None,
-		'label': 'SMS Sender Name',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL04394',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'SMS Sender Name'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 10,
-		'in_filter': None,
-		'label': 'Stock',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL05016',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Stock'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 11,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL05017',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'default_item_group',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 12,
-		'in_filter': None,
 		'label': 'Default Item Group',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01963',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Item Group',
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'Item Group'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
 		'idx': 13,
-		'in_filter': None,
 		'label': 'IGHelp',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL05018',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'To manage Item Groups, click here',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'To manage Item Groups, click here'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'default_stock_uom',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 14,
-		'in_filter': None,
 		'label': 'Default Stock UOM',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01965',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'UOM',
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'UOM'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'default_valuation_method',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 15,
-		'in_filter': None,
 		'label': 'Default Valuation Method',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01966',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'FIFO\nMoving Average',
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'FIFO\nMoving Average'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'default_warehouse_type',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 16,
-		'in_filter': None,
 		'label': 'Default Warehouse Type',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01967',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Warehouse Type',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'Warehouse Type'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 17,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL05019',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
 		'description': 'Percentage you are allowed to receive or deliver more against the quantity ordered. 
For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units
',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'tolerance',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 18,
-		'in_filter': None,
-		'label': 'Allowance Percent',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01968',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Allowance Percent'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:44:25',
-		'default': None,
-		'depends_on': None,
 		'description': 'Stock level frozen up to this date, nobody can do / modify entry except authorized person',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'stock_frozen_upto',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 19,
-		'in_filter': None,
-		'label': 'Stock Frozen Upto',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL05010',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Stock Frozen Upto'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:44:25',
-		'default': None,
-		'depends_on': None,
 		'description': 'Users with this role are allowed to do / modify stock entry before frozen date',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'stock_auth_role',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 20,
-		'in_filter': None,
 		'label': 'Authorized Role (Frozen Entry)',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL05011',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Role',
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'Role'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 21,
-		'in_filter': None,
-		'label': 'Accounts',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL05020',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Accounts'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
 		'description': 'Accounting entry frozen up to this date, nobody can do / modify entry except authorized person',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'acc_frozen_upto',
 		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
 		'idx': 22,
-		'in_filter': None,
-		'label': 'Accounts Frozen Upto',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01970',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Accounts Frozen Upto'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
 		'description': 'Users with this role are allowed to do / modify accounting entry before frozen date',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'bde_auth_role',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 23,
-		'in_filter': None,
 		'label': 'Authourized Role (Frozen Entry)',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01971',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Role',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'Role'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'credit_controller',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 24,
-		'in_filter': None,
 		'label': 'Credit Controller',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01972',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Role',
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'Role'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 25,
-		'in_filter': None,
-		'label': 'Selling',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL05021',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Selling'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-24 14:45:43',
 		'default': 'Customer Name',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'cust_master_name',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 26,
-		'in_filter': None,
 		'label': 'Customer Master created by ',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL03773',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Customer Name\nNaming Series',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'Customer Name\nNaming Series'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'default_customer_group',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 27,
-		'in_filter': None,
 		'label': 'Default Customer Group',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01974',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Customer Group',
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'Customer Group'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
 		'idx': 28,
-		'in_filter': None,
 		'label': 'CGHelp',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL05022',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'To manage Customer Groups, click here',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'To manage Customer Groups, click here'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'default_territory',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 29,
-		'in_filter': None,
 		'label': 'Default Territory',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01976',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Territory',
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'Territory'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
 		'idx': 30,
-		'in_filter': None,
 		'label': 'TerritoryHelp',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL05023',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'To manage Territory, click here',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'To manage Territory, click here'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'default_price_list',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 31,
-		'in_filter': None,
 		'label': 'Default Price List',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01978',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Price List',
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'Price List'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 32,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL05024',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:09',
 		'default': 'No',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'so_required',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 33,
-		'in_filter': None,
 		'label': 'Sales Order Required',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01980',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'No\nYes',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'No\nYes'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:09',
 		'default': 'No',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'dn_required',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 34,
-		'in_filter': None,
 		'label': 'Delivery Note Required',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01981',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'No\nYes',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'No\nYes'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 35,
-		'in_filter': None,
-		'label': 'Buying',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL05025',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Buying'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'default_supplier_type',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 36,
-		'in_filter': None,
 		'label': 'Default Supplier Type',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01983',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Supplier Type',
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'Supplier Type'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-24 14:45:43',
 		'default': 'Supplier Name',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'supp_master_name',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 37,
-		'in_filter': None,
 		'label': 'Supplier Master created by ',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL03774',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Supplier Name\nNaming Series',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'Supplier Name\nNaming Series'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 38,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL05026',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:09',
 		'default': 'No',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'po_required',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 39,
-		'in_filter': None,
 		'label': 'Purchase Order Required',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01985',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'No\nYes',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'No\nYes'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:09',
 		'default': 'No',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'pr_required',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 40,
-		'in_filter': None,
 		'label': 'Purchase Receipt Required',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01986',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'No\nYes',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'No\nYes'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 41,
-		'in_filter': None,
 		'label': 'HR',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL05027',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': '
HR
',
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': '
HR
'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:09',
-		'default': None,
-		'depends_on': None,
 		'description': 'Employee record is created using selected field. ',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'emp_created_by',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 42,
-		'in_filter': None,
 		'label': 'Employee Records to be created by ',
-		'modified': '2011-05-25 12:44:25',
-		'modified_by': 'Guest',
-		'name': 'FL01988',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': '\nNaming Series\nEmployee Number',
-		'owner': 'Administrator',
-		'parent': 'Manage Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': '\nNaming Series\nEmployee Number'
 	}
 ]
\ No newline at end of file
diff --git a/setup/doctype/market_segment/market_segment.txt b/setup/doctype/market_segment/market_segment.txt
index e531282cb1..6ecdb2529d 100644
--- a/setup/doctype/market_segment/market_segment.txt
+++ b/setup/doctype/market_segment/market_segment.txt
@@ -1 +1,80 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-12 12:10:00', 'search_fields': None, 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 1, 'read_only': 0, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 1, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:segment_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': None, 'name': 'Market Segment', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': 'Title Case', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Market Segment', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04852', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-04-28 11:34:36', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:10:00', 'doctype': 'DocField', 'oldfieldname': 'segment_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Segment Name', 'width': '', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Market Segment', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00912', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-04-28 11:34:36', 'parenttype': 'DocType', 'fieldname': 'segment_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-03-12 12:10:00', 'doctype': 'DocField', 'oldfieldname': 'details', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Market Segment', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00913', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-04-28 11:34:36', 'parenttype': 'DocType', 'fieldname': 'details', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Market Segment
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:10',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'yogesh@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:segment_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'name_case': 'Title Case',
+		'read_only': 0,
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'version': 1
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Market Segment',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Market Segment
+	{
+		'doctype': 'DocType',
+		'name': 'Market Segment'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'segment_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Segment Name',
+		'oldfieldname': 'segment_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'details',
+		'fieldtype': 'Text',
+		'idx': 3,
+		'label': 'Details',
+		'oldfieldname': 'details',
+		'oldfieldtype': 'Text',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/__init__.py b/setup/doctype/naming_series/__init__.py
similarity index 100%
rename from payroll/doctype/__init__.py
rename to setup/doctype/naming_series/__init__.py
diff --git a/settings/doctype/naming_series/naming_series.js b/setup/doctype/naming_series/naming_series.js
similarity index 100%
rename from settings/doctype/naming_series/naming_series.js
rename to setup/doctype/naming_series/naming_series.js
diff --git a/settings/doctype/naming_series/naming_series.py b/setup/doctype/naming_series/naming_series.py
similarity index 100%
rename from settings/doctype/naming_series/naming_series.py
rename to setup/doctype/naming_series/naming_series.py
diff --git a/setup/doctype/naming_series/naming_series.txt b/setup/doctype/naming_series/naming_series.txt
new file mode 100644
index 0000000000..a02d5b7943
--- /dev/null
+++ b/setup/doctype/naming_series/naming_series.txt
@@ -0,0 +1,206 @@
+# DocType, Naming Series
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-10-27 14:29:55',
+		'docstatus': 0,
+		'modified': '2010-11-26 18:45:26',
+		'modified_by': 'sneha@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'hide_heading': 1,
+		'hide_toolbar': 1,
+		'issingle': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'read_only': 1,
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 58
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Naming Series',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Naming Series',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Naming Series
+	{
+		'doctype': 'DocType',
+		'name': 'Naming Series'
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'System Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Guest'
+	},
+
+	# DocField
+	{
+		'description': 'Set prefix for numbering series on your transactions',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Setup Series'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 2,
+		'label': 'Head HTML'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'select_doc_for_series',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Select Transaction'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 4,
+		'label': 'Help HTML',
+		'options': '
\nWrite the list of series options in the list below. Each on a new line
\nAllowed special characters are "/" and "-"
\nExamples:
\nINV-
\nINV-10-
\nINVK-
\n
'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'set_options',
+		'fieldtype': 'Text',
+		'idx': 5,
+		'label': 'Set Series'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Check this if you want to force the user to select a series before saving. There will be no default if you check this.',
+		'doctype': 'DocField',
+		'fieldname': 'user_must_always_select',
+		'fieldtype': 'Check',
+		'idx': 6,
+		'label': 'User must always select'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 7,
+		'label': 'Update',
+		'options': 'update_series'
+	},
+
+	# DocField
+	{
+		'description': 'Set starting number for series of your transactions',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 8,
+		'label': 'Update Series'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'prefix',
+		'fieldtype': 'Data',
+		'idx': 9,
+		'label': 'Prefix'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'starts_from',
+		'fieldtype': 'Int',
+		'idx': 10,
+		'label': 'Starts From'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 11,
+		'label': 'Update Series Start',
+		'options': 'update_series_start'
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/naming_series_options/naming_series_options.txt b/setup/doctype/naming_series_options/naming_series_options.txt
index 21f3f29a2c..f30686daaa 100644
--- a/setup/doctype/naming_series_options/naming_series_options.txt
+++ b/setup/doctype/naming_series_options/naming_series_options.txt
@@ -1 +1,82 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-16 12:55:19', 'search_fields': None, 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 1, 'read_only': 0, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 4, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': '__NSO.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Naming Series Options', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM01027', 'parent': 'Naming Series Options', 'read': 1, 'create': None, 'creation': '2010-06-03 11:30:14', 'modified': '2010-06-03 11:40:21', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-16 12:55:19', 'doctype': 'DocField', 'oldfieldname': 'doc_type', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Doc Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Naming Series Options', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04662', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-06-03 11:40:21', 'parenttype': 'DocType', 'fieldname': 'doc_type', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2010-04-16 12:55:19', 'doctype': 'DocField', 'oldfieldname': 'series_options', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Series Options', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Naming Series Options', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04663', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-06-03 11:40:21', 'parenttype': 'DocType', 'fieldname': 'series_options', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Naming Series Options
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-12-14 10:23:17',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'yogesh@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': '__NSO.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'read_only': 0,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 4
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Naming Series Options',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'Naming Series Options',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'System Manager'
+	},
+
+	# DocType, Naming Series Options
+	{
+		'doctype': 'DocType',
+		'name': 'Naming Series Options'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'doc_type',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Doc Type',
+		'oldfieldname': 'doc_type',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'series_options',
+		'fieldtype': 'Text',
+		'idx': 2,
+		'label': 'Series Options',
+		'oldfieldname': 'series_options',
+		'oldfieldtype': 'Text'
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/absent_days_detail/__init__.py b/setup/doctype/notification_control/__init__.py
similarity index 100%
rename from payroll/doctype/absent_days_detail/__init__.py
rename to setup/doctype/notification_control/__init__.py
diff --git a/settings/doctype/notification_control/notification_control.js b/setup/doctype/notification_control/notification_control.js
similarity index 100%
rename from settings/doctype/notification_control/notification_control.js
rename to setup/doctype/notification_control/notification_control.js
diff --git a/settings/doctype/notification_control/notification_control.py b/setup/doctype/notification_control/notification_control.py
similarity index 100%
rename from settings/doctype/notification_control/notification_control.py
rename to setup/doctype/notification_control/notification_control.py
diff --git a/setup/doctype/notification_control/notification_control.txt b/setup/doctype/notification_control/notification_control.txt
new file mode 100644
index 0000000000..e93408c6e6
--- /dev/null
+++ b/setup/doctype/notification_control/notification_control.txt
@@ -0,0 +1,330 @@
+# DocType, Notification Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-09-01 15:48:07',
+		'docstatus': 0,
+		'modified': '2010-10-14 10:48:02',
+		'modified_by': 'nabin@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_copy': 1,
+		'allow_email': 1,
+		'allow_print': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 79
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Notification Control',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Notification Control',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1
+	},
+
+	# DocType, Notification Control
+	{
+		'doctype': 'DocType',
+		'name': 'Notification Control'
+	},
+
+	# DocPerm
+	{
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'Guest',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Send Auto-notification for'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 2,
+		'label': 'Sales',
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'enquiry',
+		'fieldtype': 'Check',
+		'hidden': 1,
+		'idx': 3,
+		'label': 'Enquiry',
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'quotation',
+		'fieldtype': 'Check',
+		'idx': 4,
+		'label': 'Quotation'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sales_order',
+		'fieldtype': 'Check',
+		'idx': 5,
+		'label': 'Sales Order'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'delivery_note',
+		'fieldtype': 'Check',
+		'idx': 6,
+		'label': 'Delivery Note'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'receivable_voucher',
+		'fieldtype': 'Check',
+		'idx': 7,
+		'label': 'Sales Invoice'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 8,
+		'label': 'Purchase',
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'purchase_order',
+		'fieldtype': 'Check',
+		'idx': 9,
+		'label': 'Purchase Order'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'purchase_receipt',
+		'fieldtype': 'Check',
+		'idx': 10,
+		'label': 'Purchase Receipt'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'payable_voucher',
+		'fieldtype': 'Check',
+		'idx': 11,
+		'label': 'Purchase Invoice',
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'expense_voucher',
+		'fieldtype': 'Check',
+		'idx': 12,
+		'label': 'Expense Voucher'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 13,
+		'label': 'Customize the Notification'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'select_transaction',
+		'fieldtype': 'Select',
+		'idx': 14,
+		'label': 'Select Transaction',
+		'options': '\nQuotation\nSales Order\nDelivery Note\nSales Invoice\nPayment Received\nPurchase Order\nPurchase Receipt\nPayment Sent',
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'custom_message',
+		'fieldtype': 'Text Editor',
+		'idx': 15,
+		'label': 'Custom Message'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 16,
+		'label': 'Update',
+		'options': 'set_message'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'quotation_message',
+		'fieldtype': 'Text',
+		'hidden': 1,
+		'idx': 17,
+		'label': 'Quotation Message',
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sales_order_message',
+		'fieldtype': 'Text',
+		'hidden': 1,
+		'idx': 18,
+		'label': 'Sales Order Message',
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'delivery_note_message',
+		'fieldtype': 'Text',
+		'hidden': 1,
+		'idx': 19,
+		'label': 'Delivery Note Message',
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sales_invoice_message',
+		'fieldtype': 'Text',
+		'hidden': 1,
+		'idx': 20,
+		'label': 'Sales Invoice Message',
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'payment_received_message',
+		'fieldtype': 'Text',
+		'hidden': 1,
+		'idx': 21,
+		'label': 'Payment Received Message',
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'purchase_order_message',
+		'fieldtype': 'Text',
+		'hidden': 1,
+		'idx': 22,
+		'label': 'Purchase Order Message',
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'purchase_receipt_message',
+		'fieldtype': 'Text',
+		'hidden': 1,
+		'idx': 23,
+		'label': 'Purchase Receipt Message',
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'payment_sent_message',
+		'fieldtype': 'Text',
+		'hidden': 1,
+		'idx': 24,
+		'label': 'Payment Sent Message',
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'expense_voucher_approved_message',
+		'fieldtype': 'Text',
+		'hidden': 1,
+		'idx': 25,
+		'label': 'Expense Voucher Approved Message',
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'expense_voucher_rejected_message',
+		'fieldtype': 'Text',
+		'hidden': 1,
+		'idx': 26,
+		'label': 'Expense Voucher Rejected Message',
+		'print_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/order_lost_reason/order_lost_reason.txt b/setup/doctype/order_lost_reason/order_lost_reason.txt
index 87fcf7201e..d1ef5a8183 100644
--- a/setup/doctype/order_lost_reason/order_lost_reason.txt
+++ b/setup/doctype/order_lost_reason/order_lost_reason.txt
@@ -1 +1,97 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-07-07 10:35:41', 'search_fields': None, 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 5, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:order_lost_reason', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Order Lost Reason', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00344', 'parent': 'Order Lost Reason', 'read': 1, 'create': 1, 'creation': '2009-07-07 10:35:41', 'modified': '2010-09-20 09:51:33', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00555', 'parent': 'Order Lost Reason', 'read': 1, 'create': 1, 'creation': '2009-12-31 12:18:01', 'modified': '2010-09-20 09:51:33', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'Sales Master Manager', 'owner': 'saumil@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Order Lost Reason', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04854', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 09:51:33', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-07-07 10:35:41', 'doctype': 'DocField', 'oldfieldname': 'order_lost_reason', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Order Lost Reason', 'width': '', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Order Lost Reason', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02544', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 09:51:33', 'parenttype': 'DocType', 'fieldname': 'order_lost_reason', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Order Lost Reason
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:10',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'yogesh@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:order_lost_reason',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Setup',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 4
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Order Lost Reason',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Order Lost Reason',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'write': 1
+	},
+
+	# DocType, Order Lost Reason
+	{
+		'doctype': 'DocType',
+		'name': 'Order Lost Reason'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'Sales Master Manager',
+		'submit': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'order_lost_reason',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Order Lost Reason',
+		'oldfieldname': 'order_lost_reason',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/other_charges/other_charges.txt b/setup/doctype/other_charges/other_charges.txt
index 17d3e4d7d5..b9908fc3b0 100644
--- a/setup/doctype/other_charges/other_charges.txt
+++ b/setup/doctype/other_charges/other_charges.txt
@@ -1 +1,204 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2010-12-08 15:42:09', 'search_fields': None, 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': None, 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 68, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'field:title', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Other Charges', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2011-01-07 11:04:07', 'server_code_error': ' ', 'name_case': None, 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00264', 'parent': 'Other Charges', 'read': 1, 'create': 0, 'creation': '2010-12-08 15:42:09', 'modified': '2011-01-07 11:04:07', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 1, 'parenttype': 'DocType', 'role': 'Sales Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00265', 'parent': 'Other Charges', 'read': 1, 'create': 0, 'creation': '2010-12-08 15:42:09', 'modified': '2011-01-07 11:04:07', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 2, 'parenttype': 'DocType', 'role': 'Sales User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00266', 'parent': 'Other Charges', 'read': 1, 'create': 0, 'creation': '2010-12-08 15:42:09', 'modified': '2011-01-07 11:04:07', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 3, 'parenttype': 'DocType', 'role': 'Sales User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': 0, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00267', 'parent': 'Other Charges', 'read': 1, 'create': 1, 'creation': '2010-12-08 15:42:09', 'modified': '2011-01-07 11:04:07', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 4, 'parenttype': 'DocType', 'role': 'Accounts Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00268', 'parent': 'Other Charges', 'read': 1, 'create': 1, 'creation': '2010-12-08 15:42:09', 'modified': '2011-01-07 11:04:07', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 5, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': 0, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00269', 'parent': 'Other Charges', 'read': 1, 'create': 1, 'creation': '2010-12-08 15:42:09', 'modified': '2011-01-07 11:04:07', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 6, 'parenttype': 'DocType', 'role': 'Sales Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-12-08 15:42:09', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Other Charges', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01785', 'idx': 1, 'default': None, 'colour': None, 'modified': '2011-01-07 11:04:07', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-12-08 15:42:09', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Other Charges Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Other Charges', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01786', 'idx': 2, 'default': None, 'colour': None, 'modified': '2011-01-07 11:04:07', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-12-08 15:42:09', 'doctype': 'DocField', 'oldfieldname': 'title', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Title', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Other Charges', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01787', 'idx': 3, 'default': None, 'colour': None, 'modified': '2011-01-07 11:04:07', 'parenttype': 'DocType', 'fieldname': 'title', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2011-01-06 14:27:42', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Default', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Other Charges', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03934', 'idx': 4, 'default': None, 'colour': None, 'modified': '2011-01-07 11:04:07', 'parenttype': 'DocType', 'fieldname': 'is_default', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Table', 'creation': '2010-12-08 15:42:09', 'doctype': 'DocField', 'oldfieldname': 'other_charges', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Other Charges', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Other Charges', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01789', 'idx': 5, 'default': None, 'colour': None, 'modified': '2011-01-07 11:04:07', 'parenttype': 'DocType', 'fieldname': 'other_charges', 'fieldtype': 'Table', 'options': 'RV Tax Detail', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-12-08 15:42:09', 'doctype': 'DocField', 'oldfieldname': 'company', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Company', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Other Charges', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01788', 'idx': 6, 'default': None, 'colour': None, 'modified': '2011-01-07 11:04:07', 'parenttype': 'DocType', 'fieldname': 'company', 'fieldtype': 'Link', 'options': 'Company', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Other Charges
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:11',
+		'docstatus': 0,
+		'modified': '2011-01-07 11:04:07',
+		'modified_by': 'rakesh@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:title',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Setup',
+		'name': '__common__',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 56
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Other Charges',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Other Charges',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Other Charges
+	{
+		'doctype': 'DocType',
+		'name': 'Other Charges'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Sales Master Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'Sales User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'Sales User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Accounts Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 0,
+		'role': 'Sales Master Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 2,
+		'label': 'Other Charges Details',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'title',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Title',
+		'oldfieldname': 'title',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_default',
+		'fieldtype': 'Check',
+		'idx': 4,
+		'label': 'Default',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'other_charges',
+		'fieldtype': 'Table',
+		'idx': 6,
+		'label': 'Other Charges',
+		'oldfieldname': 'other_charges',
+		'oldfieldtype': 'Table',
+		'options': 'RV Tax Detail',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/period/period.txt b/setup/doctype/period/period.txt
index c1ec071a8a..15941a542a 100644
--- a/setup/doctype/period/period.txt
+++ b/setup/doctype/period/period.txt
@@ -1 +1,122 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-05-27 12:39:33', 'search_fields': None, 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'nabin@webnotestech.com', 'in_dialog': None, 'in_create': 1, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 6, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'field:period_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Period', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01015', 'parent': 'Period', 'read': 1, 'create': None, 'creation': '2010-05-27 12:39:33', 'modified': '2010-09-20 09:52:50', 'submit': None, 'doctype': 'DocPerm', 'write': 0, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'nabin@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM01016', 'parent': 'Period', 'read': 1, 'create': None, 'creation': '2010-05-27 12:39:33', 'modified': '2010-09-20 09:52:50', 'submit': None, 'doctype': 'DocPerm', 'write': 0, 'idx': 2, 'parenttype': 'DocType', 'role': 'System Manager', 'owner': 'nabin@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-05-27 12:46:35', 'doctype': 'DocField', 'oldfieldname': 'period_name', 'owner': 'nabin@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Period Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Period', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05083', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 09:52:50', 'parenttype': 'DocType', 'fieldname': 'period_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-05-27 12:46:35', 'doctype': 'DocField', 'oldfieldname': 'start_date', 'owner': 'nabin@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Start Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Period', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05084', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 09:52:50', 'parenttype': 'DocType', 'fieldname': 'start_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-05-27 12:46:35', 'doctype': 'DocField', 'oldfieldname': 'end_date', 'owner': 'nabin@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'End Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Period', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05085', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-20 09:52:50', 'parenttype': 'DocType', 'fieldname': 'end_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-05-27 12:46:35', 'doctype': 'DocField', 'oldfieldname': 'period_type', 'owner': 'nabin@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Period Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Period', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05086', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-09-20 09:52:50', 'parenttype': 'DocType', 'fieldname': 'period_type', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-05-27 12:46:35', 'doctype': 'DocField', 'oldfieldname': 'fiscal_year', 'owner': 'nabin@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Fiscal Year', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Period', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05087', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-09-20 09:52:50', 'parenttype': 'DocType', 'fieldname': 'fiscal_year', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Period
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:12',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'nabin@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'field:period_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'in_create': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 5
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Period',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Period',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'System Manager',
+		'write': 0
+	},
+
+	# DocType, Period
+	{
+		'doctype': 'DocType',
+		'name': 'Period'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'period_name',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Period Name',
+		'oldfieldname': 'period_name',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'start_date',
+		'fieldtype': 'Date',
+		'idx': 2,
+		'label': 'Start Date',
+		'oldfieldname': 'start_date',
+		'oldfieldtype': 'Date'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'end_date',
+		'fieldtype': 'Date',
+		'idx': 3,
+		'label': 'End Date',
+		'oldfieldname': 'end_date',
+		'oldfieldtype': 'Date'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'period_type',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'Period Type',
+		'oldfieldname': 'period_type',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Data',
+		'idx': 5,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Data'
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/period_control/period_control.txt b/setup/doctype/period_control/period_control.txt
index c4cf440271..5a4117ed23 100644
--- a/setup/doctype/period_control/period_control.txt
+++ b/setup/doctype/period_control/period_control.txt
@@ -1 +1,32 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-05-27 12:47:10', 'search_fields': None, 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'nabin@webnotestech.com', 'in_dialog': None, 'in_create': 1, 'read_only': 1, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 36, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': None, 'name': 'Period Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
+# DocType, Period Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:12',
+		'docstatus': 0,
+		'modified': '2011-01-03 17:46:14',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'nabin@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 1,
+		'issingle': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'read_only': 1,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 36
+	},
+
+	# DocType, Period Control
+	{
+		'doctype': 'DocType',
+		'name': 'Period Control'
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/action_detail/__init__.py b/setup/doctype/permission_control/__init__.py
similarity index 100%
rename from payroll/doctype/action_detail/__init__.py
rename to setup/doctype/permission_control/__init__.py
diff --git a/settings/doctype/permission_control/permission_control.py b/setup/doctype/permission_control/permission_control.py
similarity index 100%
rename from settings/doctype/permission_control/permission_control.py
rename to setup/doctype/permission_control/permission_control.py
diff --git a/setup/doctype/permission_control/permission_control.txt b/setup/doctype/permission_control/permission_control.txt
new file mode 100644
index 0000000000..397d6c78c5
--- /dev/null
+++ b/setup/doctype/permission_control/permission_control.txt
@@ -0,0 +1,33 @@
+# DocType, Permission Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:12',
+		'docstatus': 0,
+		'modified': '2010-12-20 15:09:18',
+		'modified_by': 'sneha@webnotestech.com',
+		'owner': 'saumil@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 1,
+		'issingle': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'read_only': 1,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 15
+	},
+
+	# DocType, Permission Control
+	{
+		'doctype': 'DocType',
+		'name': 'Permission Control'
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/personalize/personalize.txt b/setup/doctype/personalize/personalize.txt
index 4270c47787..bd4e1a2be2 100644
--- a/setup/doctype/personalize/personalize.txt
+++ b/setup/doctype/personalize/personalize.txt
@@ -1,196 +1,105 @@
+# DocType, Personalize
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
+		'creation': '2011-03-22 16:06:53',
+		'docstatus': 0,
+		'modified': '2011-03-17 12:20:29',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1303277497',
 		'allow_attach': 1,
 		'allow_copy': 1,
 		'allow_email': 1,
 		'allow_print': 1,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-09 10:50:47',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocType',
 		'document_type': 'Other',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
 		'in_create': 1,
-		'in_dialog': None,
-		'is_transaction_doc': None,
 		'issingle': 1,
-		'istable': None,
 		'max_attachments': 1,
-		'menu_index': None,
-		'modified': '2011-03-17 12:20:29',
-		'modified_by': 'Administrator',
 		'module': 'Setup',
-		'name': 'Personalize',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
+		'name': '__common__',
 		'read_only': 1,
-		'read_only_onload': None,
-		'search_fields': None,
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': None,
-		'show_in_menu': None,
-		'smallicon': None,
-		'use_template': None,
 		'version': 4
 	},
+
+	# These values are common for all DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 10:50:47',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Help HTML',
-		'modified': '2011-05-09 10:50:47',
-		'modified_by': 'Administrator',
-		'name': '000000158',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': '
You can edit HTML for your banner or add an attachment and click on "Set from Attachment"
',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'parent': 'Personalize',
 		'parentfield': 'fields',
 		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'Personalize',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocType, Personalize
+	{
+		'doctype': 'DocType',
+		'name': 'Personalize'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 1,
+		'label': 'Help HTML',
+		'options': '
You can edit HTML for your banner or add an attachment and click on "Set from Attachment"
'
+	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 10:50:47',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'header_html',
 		'fieldtype': 'Code',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
-		'in_filter': None,
-		'label': 'Banner HTML',
-		'modified': '2011-05-09 10:50:47',
-		'modified_by': 'Administrator',
-		'name': '000000159',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Personalize',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Banner HTML'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 10:50:47',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'set_from_attachment',
 		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
-		'in_filter': None,
-		'label': 'Set from attachment',
-		'modified': '2011-05-09 10:50:47',
-		'modified_by': 'Administrator',
-		'name': '000000160',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Personalize',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Set from attachment'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 10:50:47',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'file_list',
 		'fieldtype': 'Text',
 		'hidden': 1,
-		'icon': None,
 		'idx': 4,
-		'in_filter': None,
-		'label': 'File List',
-		'modified': '2011-05-09 10:50:47',
-		'modified_by': 'Administrator',
-		'name': '000000161',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Personalize',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'File List'
 	}
 ]
\ No newline at end of file
diff --git a/setup/doctype/price_list/price_list.txt b/setup/doctype/price_list/price_list.txt
index e303d518bb..5185a632bf 100644
--- a/setup/doctype/price_list/price_list.txt
+++ b/setup/doctype/price_list/price_list.txt
@@ -1,380 +1,185 @@
+# DocType, Price List
 [
+
+	# These values are common in all dictionaries
 	{
-		'allow_attach': 1,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': 1,
-		'autoname': 'field:price_list_name',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
 		'creation': '2010-08-08 17:09:13',
-		'description': None,
 		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
 		'modified': '2011-04-18 10:01:48',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1303100817',
+		'allow_attach': 1,
+		'allow_trash': 1,
+		'autoname': 'field:price_list_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
 		'module': 'Setup',
-		'name': 'Price List',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
+		'name': '__common__',
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
 		'version': 6
 	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Price List',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
 	{
 		'amend': 0,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Price List',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'submit': 0
+	},
+
+	# DocType, Price List
+	{
+		'doctype': 'DocType',
+		'name': 'Price List'
+	},
+
+	# DocPerm
+	{
 		'cancel': 0,
 		'create': 0,
-		'creation': '2010-08-08 17:09:13',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 1,
-		'match': None,
-		'modified': '2010-08-08 17:09:13',
-		'modified_by': 'Administrator',
-		'name': 'PERM00392',
-		'owner': 'Administrator',
-		'parent': 'Price List',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'read': 1,
 		'role': 'Sales Manager',
-		'submit': 0,
 		'write': 0
 	},
+
+	# DocPerm
 	{
-		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'creation': '2010-08-08 17:09:13',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 2,
-		'match': None,
-		'modified': '2010-08-08 17:09:13',
-		'modified_by': 'Administrator',
-		'name': 'PERM00393',
-		'owner': 'Administrator',
-		'parent': 'Price List',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'read': 1,
 		'role': 'Sales Manager',
-		'submit': 0,
 		'write': 0
 	},
+
+	# DocPerm
 	{
-		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'creation': '2010-08-08 17:09:13',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 3,
-		'match': None,
-		'modified': '2010-08-08 17:09:13',
-		'modified_by': 'Administrator',
-		'name': 'PERM00394',
-		'owner': 'Administrator',
-		'parent': 'Price List',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 1,
-		'read': 1,
 		'role': 'Sales User',
-		'submit': 0,
 		'write': 0
 	},
+
+	# DocPerm
 	{
-		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'creation': '2010-08-08 17:09:13',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 4,
-		'match': None,
-		'modified': '2010-08-08 17:09:13',
-		'modified_by': 'Administrator',
-		'name': 'PERM00395',
-		'owner': 'Administrator',
-		'parent': 'Price List',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'read': 1,
 		'role': 'Sales User',
-		'submit': 0,
 		'write': 0
 	},
+
+	# DocPerm
 	{
-		'amend': 0,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2010-08-08 17:09:13',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 5,
-		'match': '',
-		'modified': '2010-08-08 17:09:13',
-		'modified_by': 'Administrator',
-		'name': 'PERM00396',
-		'owner': 'Administrator',
-		'parent': 'Price List',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'read': 1,
 		'role': 'Sales Master Manager',
-		'submit': 0,
 		'write': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:13',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'trash_reason',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 1,
-		'in_filter': None,
 		'label': 'Trash Reason',
-		'modified': '2011-04-18 13:55:33',
-		'modified_by': 'Administrator',
-		'name': 'FL02242',
-		'no_copy': None,
 		'oldfieldname': 'trash_reason',
 		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Price List',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:13',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'price_list_name',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
-		'in_filter': None,
 		'label': 'Price List Name',
-		'modified': '2011-04-18 13:55:33',
-		'modified_by': 'Administrator',
-		'name': 'FL02243',
-		'no_copy': None,
 		'oldfieldname': 'price_list_name',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Price List',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-04-18 13:55:34',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
-		'in_filter': None,
 		'label': 'Price Help',
-		'modified': '2011-04-18 13:55:34',
-		'modified_by': 'Administrator',
-		'name': '000000143',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Price List',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-04-18 13:55:33',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
 		'description': 'Click on this button to clear prices for this list in all items',
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 4,
-		'in_filter': None,
 		'label': 'Clear Prices',
-		'modified': '2011-04-18 13:55:33',
-		'modified_by': 'Administrator',
-		'name': '000000140',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Price List',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-18 13:55:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'file_list',
 		'fieldtype': 'Text',
 		'hidden': 1,
-		'icon': None,
 		'idx': 5,
-		'in_filter': None,
 		'label': 'File List',
-		'modified': '2011-04-18 13:55:34',
-		'modified_by': 'Administrator',
-		'name': '000000141',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Price List',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-04-18 13:55:34',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
 		'description': 'Update prices from the attachment',
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
 		'idx': 6,
-		'in_filter': None,
 		'label': 'Update Prices',
-		'modified': '2011-04-18 13:55:34',
-		'modified_by': 'Administrator',
-		'name': '000000142',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'update_prices',
-		'owner': 'Administrator',
-		'parent': 'Price List',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Server',
-		'width': None
+		'trigger': 'Server'
 	}
 ]
\ No newline at end of file
diff --git a/payroll/doctype/appraisal/__init__.py b/setup/doctype/print_heading/__init__.py
similarity index 100%
rename from payroll/doctype/appraisal/__init__.py
rename to setup/doctype/print_heading/__init__.py
diff --git a/settings/doctype/print_heading/print_heading.js b/setup/doctype/print_heading/print_heading.js
similarity index 100%
rename from settings/doctype/print_heading/print_heading.js
rename to setup/doctype/print_heading/print_heading.js
diff --git a/settings/doctype/print_heading/print_heading.py b/setup/doctype/print_heading/print_heading.py
similarity index 100%
rename from settings/doctype/print_heading/print_heading.py
rename to setup/doctype/print_heading/print_heading.py
diff --git a/setup/doctype/print_heading/print_heading.txt b/setup/doctype/print_heading/print_heading.txt
new file mode 100644
index 0000000000..db4c07a9bb
--- /dev/null
+++ b/setup/doctype/print_heading/print_heading.txt
@@ -0,0 +1,103 @@
+# DocType, Print Heading
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:13',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1294312215',
+		'allow_trash': 1,
+		'autoname': 'field:print_heading',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Setup',
+		'name': '__common__',
+		'search_fields': 'print_heading',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 27
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Print Heading',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'Print Heading',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'All',
+		'write': 1
+	},
+
+	# DocType, Print Heading
+	{
+		'doctype': 'DocType',
+		'name': 'Print Heading'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'print_heading',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'Print Heading',
+		'oldfieldname': 'print_heading',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Small Text',
+		'idx': 3,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'width': '300px'
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/appraisal_detail/__init__.py b/setup/doctype/role/__init__.py
similarity index 100%
rename from payroll/doctype/appraisal_detail/__init__.py
rename to setup/doctype/role/__init__.py
diff --git a/roles/doctype/role/role.js b/setup/doctype/role/role.js
similarity index 100%
rename from roles/doctype/role/role.js
rename to setup/doctype/role/role.js
diff --git a/roles/doctype/role/role.py b/setup/doctype/role/role.py
similarity index 100%
rename from roles/doctype/role/role.py
rename to setup/doctype/role/role.py
diff --git a/setup/doctype/role/role.txt b/setup/doctype/role/role.txt
new file mode 100644
index 0000000000..afebb31158
--- /dev/null
+++ b/setup/doctype/role/role.txt
@@ -0,0 +1,114 @@
+# DocType, Role
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2009-05-12 11:19:11',
+		'docstatus': 0,
+		'modified': '2010-12-28 17:02:39',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1307624201',
+		'allow_copy': 0,
+		'allow_email': 0,
+		'allow_print': 0,
+		'autoname': 'field:role_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'hide_heading': 0,
+		'hide_toolbar': 0,
+		'idx': 0,
+		'issingle': 0,
+		'istable': 0,
+		'module': 'Setup',
+		'name': '__common__',
+		'read_only': 0,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 1
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Role',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'cancel': 0,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'execute': 0,
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'Role',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'Administrator',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocType, Role
+	{
+		'doctype': 'DocType',
+		'name': 'Role'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'module',
+		'fieldtype': 'Select',
+		'idx': 1,
+		'label': 'Module',
+		'oldfieldname': 'module',
+		'oldfieldtype': 'Select',
+		'options': 'link:Module Def',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'role_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Role Name',
+		'oldfieldname': 'role_name',
+		'oldfieldtype': 'Data',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'defaults',
+		'fieldtype': 'Table',
+		'hidden': 0,
+		'idx': 3,
+		'label': 'Defaults',
+		'oldfieldname': 'defaults',
+		'oldfieldtype': 'Table',
+		'options': 'DefaultValue',
+		'reqd': 0,
+		'search_index': 0
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/sales_browser_control/sales_browser_control.txt b/setup/doctype/sales_browser_control/sales_browser_control.txt
index 8ab44e172b..ce635f4c8a 100644
--- a/setup/doctype/sales_browser_control/sales_browser_control.txt
+++ b/setup/doctype/sales_browser_control/sales_browser_control.txt
@@ -1 +1,30 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-06-17 15:07:09', 'search_fields': None, 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 157, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': None, 'name': 'Sales Browser Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
+# DocType, Sales Browser Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:21',
+		'docstatus': 0,
+		'modified': '2010-12-24 11:56:36',
+		'modified_by': 'abhishek@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 159
+	},
+
+	# DocType, Sales Browser Control
+	{
+		'doctype': 'DocType',
+		'name': 'Sales Browser Control'
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/sales_partner/sales_partner.txt b/setup/doctype/sales_partner/sales_partner.txt
index f4c2857393..a61a9fb2dc 100644
--- a/setup/doctype/sales_partner/sales_partner.txt
+++ b/setup/doctype/sales_partner/sales_partner.txt
@@ -1,927 +1,373 @@
+# DocType, Sales Partner
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': '1305622930',
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
+		'creation': '2010-08-08 17:09:22',
+		'docstatus': 0,
+		'modified': '2011-05-17 14:32:10',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1307707462',
 		'allow_trash': 1,
 		'autoname': 'field:partner_name',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:22',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocType',
 		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
 		'in_create': 0,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-17 14:32:10',
-		'modified_by': 'Guest',
 		'module': 'Setup',
-		'name': 'Sales Partner',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
+		'name': '__common__',
 		'read_only': 0,
-		'read_only_onload': None,
-		'search_fields': None,
 		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
 		'version': 72
 	},
+
+	# These values are common for all DocField
 	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:22',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2010-08-08 17:09:22',
-		'modified_by': 'Administrator',
-		'name': 'PERM00504',
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:22',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2010-08-08 17:09:22',
-		'modified_by': 'Administrator',
-		'name': 'PERM00505',
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:22',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2010-08-08 17:09:22',
-		'modified_by': 'Administrator',
-		'name': 'PERM00506',
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:22',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2010-08-08 17:09:22',
-		'modified_by': 'Administrator',
-		'name': 'PERM00507',
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:22',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2010-08-08 17:09:22',
-		'modified_by': 'Administrator',
-		'name': 'PERM00508',
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales Master Manager',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:22',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2010-08-08 17:09:22',
-		'modified_by': 'Administrator',
-		'name': 'PERM00509',
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales Master Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': None,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:22',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 7,
-		'match': None,
-		'modified': '2010-08-08 17:09:22',
-		'modified_by': 'Administrator',
-		'name': 'PERM00510',
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 0,
-		'creation': '2010-08-08 17:09:22',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 8,
-		'match': None,
-		'modified': '2010-08-08 17:09:22',
-		'modified_by': 'Administrator',
-		'name': 'PERM00511',
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': None,
-		'write': 0
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:33',
-		'default': None,
-		'depends_on': None,
-		'description': 'Note: You Can Manage Multiple Address or Contacts via Addresses & Contacts',
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Basic Info',
-		'modified': '2011-05-25 12:45:33',
-		'modified_by': 'Guest',
-		'name': 'FL05429',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
+		'name': '__common__',
 		'parent': 'Sales Partner',
 		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'parenttype': 'DocType'
 	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Sales Partner',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Sales Partner
+	{
+		'doctype': 'DocType',
+		'name': 'Sales Partner'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Sales Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Sales Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Sales User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Sales User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Sales Master Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'Sales Master Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 7,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 8,
+		'permlevel': 1,
+		'role': 'System Manager',
+		'write': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Note: You Can Manage Multiple Address or Contacts via Addresses & Contacts',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Basic Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'partner_name',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
 		'in_filter': 1,
 		'label': 'Sales Partner Name',
-		'modified': '2011-05-25 12:45:32',
-		'modified_by': 'Guest',
-		'name': 'FL03128',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'partner_name',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'partner_type',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
 		'in_filter': 1,
 		'label': 'Partner Type',
-		'modified': '2011-05-25 12:45:32',
-		'modified_by': 'Guest',
-		'name': 'FL03129',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'partner_type',
 		'oldfieldtype': 'Select',
 		'options': '\nChannel Partner\nDistributor\nDealer\nAgent\nRetailer\nImplementation Partner\nReseller',
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:33',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 4,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:33',
-		'modified_by': 'Guest',
-		'name': 'FL05430',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'commission_rate',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 5,
-		'in_filter': None,
 		'label': 'Commission Rate',
-		'modified': '2011-05-25 12:45:32',
-		'modified_by': 'Guest',
-		'name': 'FL03130',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'commission_rate',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'territory',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 6,
-		'in_filter': None,
 		'label': 'Territory',
-		'modified': '2011-05-25 12:45:32',
-		'modified_by': 'Guest',
-		'name': 'FL03143',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'Territory',
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:33',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 7,
-		'in_filter': None,
 		'label': 'Address & Contacts',
-		'modified': '2011-05-25 12:45:33',
-		'modified_by': 'Guest',
-		'name': 'FL05431',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:33',
-		'default': None,
 		'depends_on': 'eval:doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
 		'idx': 8,
-		'in_filter': None,
 		'label': 'Address Desc',
-		'modified': '2011-05-25 12:45:33',
-		'modified_by': 'Guest',
-		'name': 'FL05432',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'Addresses will appear only when you save the customer',
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:33',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
 		'idx': 9,
-		'in_filter': None,
 		'label': 'Address HTML',
-		'modified': '2011-05-25 12:45:33',
-		'modified_by': 'Guest',
-		'name': 'FL05433',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:33',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 10,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:33',
-		'modified_by': 'Guest',
-		'name': 'FL05434',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:33',
-		'default': None,
 		'depends_on': 'eval:doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
 		'idx': 11,
-		'in_filter': None,
 		'label': 'Contact Desc',
-		'modified': '2011-05-25 12:45:33',
-		'modified_by': 'Guest',
-		'name': 'FL05435',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'Contact Details will appear only when you save the customer',
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:33',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
 		'idx': 12,
-		'in_filter': None,
 		'label': 'Contact HTML',
-		'modified': '2011-05-25 12:45:33',
-		'modified_by': 'Guest',
-		'name': 'FL05436',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:33',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 13,
-		'in_filter': None,
 		'label': 'Partner Target Details',
-		'modified': '2011-05-25 12:45:33',
-		'modified_by': 'Guest',
-		'name': 'FL05437',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Sales Partner',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'distribution_id',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 14,
-		'in_filter': None,
 		'label': 'Distribution Id',
-		'modified': '2011-05-25 12:45:33',
-		'modified_by': 'Guest',
-		'name': 'FL03148',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'distribution_id',
 		'oldfieldtype': 'Link',
 		'options': 'Budget Distribution',
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'partner_target_details',
 		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
 		'idx': 15,
-		'in_filter': None,
 		'label': 'Partner Target Detail',
-		'modified': '2011-05-25 12:45:33',
-		'modified_by': 'Guest',
-		'name': 'FL03149',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'partner_target_details',
 		'oldfieldtype': 'Table',
 		'options': 'Target Detail',
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:33',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'HTML',
 		'hidden': 1,
-		'icon': None,
 		'idx': 16,
-		'in_filter': None,
 		'label': 'Manage HTML',
-		'modified': '2011-05-25 12:45:33',
-		'modified_by': 'Guest',
-		'name': 'FL05438',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'HTML',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:33',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 17,
-		'in_filter': None,
 		'label': 'Transaction History',
-		'modified': '2011-05-25 12:45:33',
-		'modified_by': 'Guest',
-		'name': 'FL05439',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'yogesh@webnotestech.com',
-		'parent': 'Sales Partner',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:33',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
 		'idx': 18,
-		'in_filter': None,
 		'label': 'History HTML',
-		'modified': '2011-05-25 12:45:33',
-		'modified_by': 'Guest',
-		'name': 'FL05440',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'HTML',
-		'options': None,
-		'owner': 'yogesh@webnotestech.com',
-		'parent': 'Sales Partner',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:22',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'trash_reason',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 19,
-		'in_filter': None,
 		'label': 'Trash Reason',
-		'modified': '2011-05-25 12:45:33',
-		'modified_by': 'Guest',
-		'name': 'FL03124',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'trash_reason',
 		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Partner',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	}
 ]
\ No newline at end of file
diff --git a/setup/doctype/sales_person/sales_person.txt b/setup/doctype/sales_person/sales_person.txt
index f99653c8a3..0ffcd7422a 100644
--- a/setup/doctype/sales_person/sales_person.txt
+++ b/setup/doctype/sales_person/sales_person.txt
@@ -1,1420 +1,426 @@
+# DocType, Sales Person
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': '1300960454',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
+		'creation': '2010-08-08 17:09:22',
+		'docstatus': 0,
+		'modified': '2011-02-23 15:11:46',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1302765705',
 		'allow_trash': 1,
 		'autoname': 'field:sales_person_name',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
 		'colour': 'White:FFF',
-		'creation': '2010-11-30 22:43:05',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocType',
 		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
 		'in_create': 1,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'last_update': '1294161036',
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2010-11-18 12:16:35',
-		'modified_by': 'Administrator',
 		'module': 'Setup',
-		'name': 'Sales Person',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
+		'name': '__common__',
 		'search_fields': 'name,parent_sales_person',
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 133
+		'version': 131
 	},
+
+	# These values are common for all DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:25:37',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'trash_reason',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Trash Reason',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00443',
-		'no_copy': None,
-		'oldfieldname': 'trash_reason',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
+		'name': '__common__',
 		'parent': 'Sales Person',
 		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'parenttype': 'DocType'
 	},
+
+	# These values are common for all DocPerm
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:43:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'trash_reason',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Trash Reason',
-		'modified': '2010-11-30 22:43:05',
-		'modified_by': 'Administrator',
-		'name': 'FL03156',
-		'no_copy': None,
-		'oldfieldname': 'trash_reason',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
+		'amend': 0,
+		'doctype': 'DocPerm',
+		'name': '__common__',
 		'parent': 'Sales Person',
-		'parentfield': 'fields',
+		'parentfield': 'permissions',
 		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'read': 1,
+		'submit': 0
 	},
+
+	# DocType, Sales Person
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-24 15:58:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
+		'doctype': 'DocType',
+		'name': 'Sales Person'
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Sales Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Sales Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Sales User',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Sales User',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Sales Master Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'Sales Master Manager',
+		'write': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
 		'idx': 2,
-		'in_filter': None,
 		'label': 'General Info',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': '000006299',
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
 		'options': 'Simple',
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:43:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'sales_person_name',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
 		'in_filter': 1,
 		'label': 'Sales Person Name',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': 'FL03158',
-		'no_copy': None,
 		'oldfieldname': 'sales_person_name',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-11-30 22:43:05',
-		'default': None,
-		'depends_on': None,
 		'description': 'Select company name first.',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'parent_sales_person',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 4,
-		'in_filter': None,
 		'label': 'Parent Sales Person',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': 'FL03159',
-		'no_copy': None,
 		'oldfieldname': 'parent_sales_person',
 		'oldfieldtype': 'Link',
 		'options': 'Sales Person',
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
 		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-24 15:58:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
 		'idx': 5,
-		'in_filter': None,
 		'label': 'SPHelp',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': '000006300',
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'HTML',
 		'options': 'To manage Sales Person, click here',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:43:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'is_group',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 6,
-		'in_filter': None,
 		'label': 'Has Child Node',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': 'FL03042',
-		'no_copy': None,
 		'oldfieldname': 'is_group',
 		'oldfieldtype': 'Select',
 		'options': '\nYes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:43:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'is_group',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Has Child Node',
-		'modified': '2010-11-30 22:43:05',
-		'modified_by': 'Administrator',
-		'name': 'FL03161',
-		'no_copy': None,
-		'oldfieldname': 'is_group',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'fieldname': 'employee',
+		'fieldtype': 'Link',
+		'idx': 7,
+		'label': 'Employee',
+		'options': 'Employee',
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:41:52',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'department',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
+		'idx': 8,
 		'label': 'Department',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': 'FL02338',
-		'no_copy': None,
 		'oldfieldname': 'department',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:43:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'department',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Department',
-		'modified': '2010-11-30 22:43:05',
-		'modified_by': 'Administrator',
-		'name': 'FL03162',
-		'no_copy': None,
-		'oldfieldname': 'department',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:36',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'designation',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
+		'idx': 9,
 		'label': 'Designation',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00728',
-		'no_copy': None,
 		'oldfieldname': 'designation',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:43:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'designation',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Designation',
-		'modified': '2010-11-30 22:43:05',
-		'modified_by': 'Administrator',
-		'name': 'FL03163',
-		'no_copy': None,
-		'oldfieldname': 'designation',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:31:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'mobile_no',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Mobile No',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': 'FL01300',
-		'no_copy': None,
-		'oldfieldname': 'mobile_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:43:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'mobile_no',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Mobile No',
-		'modified': '2010-11-30 22:43:05',
-		'modified_by': 'Administrator',
-		'name': 'FL03164',
-		'no_copy': None,
-		'oldfieldname': 'mobile_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-24 15:58:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 10,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': '000006301',
-		'no_copy': None,
-		'oldfieldname': None,
+		'label': 'Mobile No',
+		'oldfieldname': 'mobile_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 11,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:31:13',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'email_id',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
+		'idx': 12,
 		'label': 'Email Id',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': 'FL01157',
-		'no_copy': None,
 		'oldfieldname': 'email_id',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:43:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'email_id',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Email Id',
-		'modified': '2010-11-30 22:43:05',
-		'modified_by': 'Administrator',
-		'name': 'FL03166',
-		'no_copy': None,
-		'oldfieldname': 'email_id',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2009-05-12 11:19:12',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'country',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
+		'idx': 13,
 		'in_filter': 1,
 		'label': 'Country',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00177',
-		'no_copy': None,
 		'oldfieldname': 'country',
 		'oldfieldtype': 'Select',
 		'options': 'link:Country',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
 		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:43:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'country',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': 1,
-		'label': 'Country',
-		'modified': '2010-11-30 22:43:05',
-		'modified_by': 'Administrator',
-		'name': 'FL03167',
-		'no_copy': None,
-		'oldfieldname': 'country',
-		'oldfieldtype': 'Select',
-		'options': 'link:Country',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2009-05-12 11:19:12',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'state',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': 1,
-		'label': 'State',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00176',
-		'no_copy': None,
-		'oldfieldname': 'state',
-		'oldfieldtype': 'Select',
-		'options': 'link:State',
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:43:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'state',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': 1,
-		'label': 'State',
-		'modified': '2010-11-30 22:43:05',
-		'modified_by': 'Administrator',
-		'name': 'FL03168',
-		'no_copy': None,
-		'oldfieldname': 'state',
-		'oldfieldtype': 'Select',
-		'options': 'link:State',
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2009-05-12 11:19:12',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'city',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 14,
-		'in_filter': None,
-		'label': 'City',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00174',
-		'no_copy': None,
-		'oldfieldname': 'city',
+		'in_filter': 1,
+		'label': 'State',
+		'oldfieldname': 'state',
 		'oldfieldtype': 'Select',
-		'options': 'link:City',
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
+		'options': 'link:State',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:43:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'city',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
+		'idx': 15,
 		'label': 'City',
-		'modified': '2010-11-30 22:43:05',
-		'modified_by': 'Administrator',
-		'name': 'FL03169',
-		'no_copy': None,
 		'oldfieldname': 'city',
-		'oldfieldtype': 'Select',
-		'options': 'link:City',
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
+		'oldfieldtype': 'Data',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:43:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'territory',
 		'fieldtype': 'Link',
 		'hidden': 0,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
+		'idx': 16,
 		'label': 'Territory',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': 'FL03170',
-		'no_copy': None,
 		'oldfieldname': 'territory',
 		'oldfieldtype': 'Link',
 		'options': 'Territory',
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-24 15:58:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
+		'idx': 17,
 		'label': 'Territory Help',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': '000006302',
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'HTML',
 		'options': 'To manage Territory, click here',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:32',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'lft',
 		'fieldtype': 'Int',
 		'hidden': 1,
-		'icon': None,
-		'idx': 17,
+		'idx': 18,
 		'in_filter': 1,
 		'label': 'lft',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00618',
 		'no_copy': 1,
 		'oldfieldname': 'lft',
 		'oldfieldtype': 'Int',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:43:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'lft',
-		'fieldtype': 'Int',
-		'hidden': 1,
-		'icon': None,
-		'idx': 17,
-		'in_filter': 1,
-		'label': 'lft',
-		'modified': '2010-11-30 22:43:05',
-		'modified_by': 'Administrator',
-		'name': 'FL03172',
-		'no_copy': 1,
-		'oldfieldname': 'lft',
-		'oldfieldtype': 'Int',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:32',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'rgt',
 		'fieldtype': 'Int',
 		'hidden': 1,
-		'icon': None,
-		'idx': 18,
+		'idx': 19,
 		'in_filter': 1,
 		'label': 'rgt',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00619',
 		'no_copy': 1,
 		'oldfieldname': 'rgt',
 		'oldfieldtype': 'Int',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
 		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
+		'search_index': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:43:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'rgt',
-		'fieldtype': 'Int',
-		'hidden': 1,
-		'icon': None,
-		'idx': 18,
-		'in_filter': 1,
-		'label': 'rgt',
-		'modified': '2010-11-30 22:43:05',
-		'modified_by': 'Administrator',
-		'name': 'FL03173',
-		'no_copy': 1,
-		'oldfieldname': 'rgt',
-		'oldfieldtype': 'Int',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:32',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'old_parent',
 		'fieldtype': 'Data',
 		'hidden': 1,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
+		'idx': 20,
 		'label': 'old_parent',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00617',
 		'no_copy': 1,
 		'oldfieldname': 'old_parent',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'print_hide': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:43:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'old_parent',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'old_parent',
-		'modified': '2010-11-30 22:43:05',
-		'modified_by': 'Administrator',
-		'name': 'FL03174',
-		'no_copy': 1,
-		'oldfieldname': 'old_parent',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 17:30:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'distribution_id',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'Distribution Id',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': 'FL00673',
-		'no_copy': None,
-		'oldfieldname': 'distribution_id',
-		'oldfieldtype': 'Link',
-		'options': 'Budget Distribution',
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:43:05',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'distribution_id',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'Distribution Id',
-		'modified': '2010-11-30 22:43:05',
-		'modified_by': 'Administrator',
-		'name': 'FL03175',
-		'no_copy': None,
-		'oldfieldname': 'distribution_id',
-		'oldfieldtype': 'Link',
-		'options': 'Budget Distribution',
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-24 15:58:01',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 21,
-		'in_filter': None,
+		'label': 'Distribution Id',
+		'oldfieldname': 'distribution_id',
+		'oldfieldtype': 'Link',
+		'options': 'Budget Distribution',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 22,
 		'label': 'Target Details',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': '000006303',
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
 		'options': 'Simple',
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-11-30 22:43:06',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'target_details',
 		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
+		'idx': 23,
 		'label': 'Target Details1',
-		'modified': '2011-03-24 15:58:01',
-		'modified_by': 'Administrator',
-		'name': 'FL03177',
-		'no_copy': None,
 		'oldfieldname': 'target_details',
 		'oldfieldtype': 'Table',
 		'options': 'Target Detail',
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-11-30 22:43:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2010-11-30 22:43:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00558',
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-11-30 22:43:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2010-11-30 22:43:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00559',
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-11-30 22:43:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2010-11-30 22:43:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00560',
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-11-30 22:43:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2010-11-30 22:43:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00561',
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-11-30 22:43:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2010-11-30 22:43:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00562',
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales Master Manager',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-11-30 22:43:05',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2010-11-30 22:43:05',
-		'modified_by': 'Administrator',
-		'name': 'PERM00563',
-		'owner': 'Administrator',
-		'parent': 'Sales Person',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Sales Master Manager',
-		'submit': 0,
-		'write': 0
+		'permlevel': 0
 	}
 ]
\ No newline at end of file
diff --git a/setup/doctype/setup_control/setup_control.txt b/setup/doctype/setup_control/setup_control.txt
index 85d27f45be..5ded66ba6b 100644
--- a/setup/doctype/setup_control/setup_control.txt
+++ b/setup/doctype/setup_control/setup_control.txt
@@ -1 +1,33 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-03 13:32:18', 'search_fields': None, 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 1, 'read_only': 1, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 87, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 0, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': None, 'name': 'Setup Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
+# DocType, Setup Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:24',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'yogesh@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 1,
+		'issingle': 1,
+		'istable': 0,
+		'module': 'Setup',
+		'name': '__common__',
+		'read_only': 1,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 73
+	},
+
+	# DocType, Setup Control
+	{
+		'doctype': 'DocType',
+		'name': 'Setup Control'
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/attendance/__init__.py b/setup/doctype/setup_wizard_control/__init__.py
similarity index 100%
rename from payroll/doctype/attendance/__init__.py
rename to setup/doctype/setup_wizard_control/__init__.py
diff --git a/settings/doctype/setup_wizard_control/setup_wizard_control.py b/setup/doctype/setup_wizard_control/setup_wizard_control.py
similarity index 100%
rename from settings/doctype/setup_wizard_control/setup_wizard_control.py
rename to setup/doctype/setup_wizard_control/setup_wizard_control.py
diff --git a/setup/doctype/setup_wizard_control/setup_wizard_control.txt b/setup/doctype/setup_wizard_control/setup_wizard_control.txt
new file mode 100644
index 0000000000..a83d94ecdf
--- /dev/null
+++ b/setup/doctype/setup_wizard_control/setup_wizard_control.txt
@@ -0,0 +1,31 @@
+# DocType, Setup Wizard Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:24',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'sneha@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 108
+	},
+
+	# DocType, Setup Wizard Control
+	{
+		'doctype': 'DocType',
+		'name': 'Setup Wizard Control'
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/attendance_control_panel/__init__.py b/setup/doctype/sms_settings/__init__.py
old mode 100644
new mode 100755
similarity index 100%
rename from payroll/doctype/attendance_control_panel/__init__.py
rename to setup/doctype/sms_settings/__init__.py
diff --git a/setup/doctype/sms_settings/sms_settings.txt b/setup/doctype/sms_settings/sms_settings.txt
new file mode 100755
index 0000000000..f4bddd6b83
--- /dev/null
+++ b/setup/doctype/sms_settings/sms_settings.txt
@@ -0,0 +1,139 @@
+# DocType, SMS Settings
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2011-05-24 18:21:16',
+		'docstatus': 0,
+		'modified': '2011-05-25 11:59:34',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1306304974',
+		'allow_copy': 1,
+		'allow_email': 1,
+		'allow_print': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 0,
+		'issingle': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'read_only': 0,
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'version': 16
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'SMS Settings',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'SMS Settings',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'role': 'System Manager'
+	},
+
+	# DocType, SMS Settings
+	{
+		'doctype': 'DocType',
+		'name': 'SMS Settings'
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 1,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Eg. smsgateway.com/api/send_sms.cgi',
+		'doctype': 'DocField',
+		'fieldname': 'sms_gateway_url',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'SMS Gateway URL',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Enter url parameter for message',
+		'doctype': 'DocField',
+		'fieldname': 'message_parameter',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Message Parameter',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Enter url parameter for receiver nos',
+		'doctype': 'DocField',
+		'fieldname': 'receiver_parameter',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'Receiver Parameter',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 5,
+		'label': 'Static Parameters',
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)',
+		'doctype': 'DocField',
+		'fieldname': 'static_parameter_details',
+		'fieldtype': 'Table',
+		'idx': 6,
+		'label': 'Static Parameter Details',
+		'options': 'Static Parameter Detail'
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/state/state.txt b/setup/doctype/state/state.txt
index 72384ea9a8..09e186b99d 100644
--- a/setup/doctype/state/state.txt
+++ b/setup/doctype/state/state.txt
@@ -1 +1,105 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-31 16:47:00', 'search_fields': None, 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 0, 'read_only': 0, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 15, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'field:state_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'State', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': '', 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00533', 'parent': 'State', 'read': 1, 'create': 1, 'creation': '2009-12-15 16:10:15', 'modified': '2010-09-20 11:03:36', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'dhanalekshmi@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00582', 'parent': 'State', 'read': 1, 'create': 1, 'creation': '2010-01-12 16:42:57', 'modified': '2010-09-20 11:03:36', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'Sales Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00759', 'parent': 'State', 'read': 1, 'create': 1, 'creation': '2010-04-08 13:47:15', 'modified': '2010-09-20 11:03:36', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'Purchase Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-31 16:47:00', 'doctype': 'DocField', 'oldfieldname': 'state_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'State Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'State', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01598', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 11:03:36', 'parenttype': 'DocType', 'fieldname': 'state_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-03-31 16:47:00', 'doctype': 'DocField', 'oldfieldname': 'country', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Country', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'State', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01599', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 11:03:36', 'parenttype': 'DocType', 'fieldname': 'country', 'fieldtype': 'Select', 'options': 'link:Country', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, State
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:25',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'field:state_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'in_create': 0,
+		'module': 'Setup',
+		'name': '__common__',
+		'read_only': 0,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 14
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'State',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'State',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'write': 1
+	},
+
+	# DocType, State
+	{
+		'doctype': 'DocType',
+		'name': 'State'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'Sales Master Manager',
+		'submit': 0
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'role': 'Purchase Master Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'state_name',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'State Name',
+		'oldfieldname': 'state_name',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'country',
+		'fieldtype': 'Select',
+		'idx': 2,
+		'label': 'Country',
+		'oldfieldname': 'country',
+		'oldfieldtype': 'Select',
+		'options': 'link:Country'
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/branch/__init__.py b/setup/doctype/static_parameter_detail/__init__.py
old mode 100644
new mode 100755
similarity index 100%
rename from payroll/doctype/branch/__init__.py
rename to setup/doctype/static_parameter_detail/__init__.py
diff --git a/setup/doctype/static_parameter_detail/static_parameter_detail.txt b/setup/doctype/static_parameter_detail/static_parameter_detail.txt
new file mode 100755
index 0000000000..587a716de1
--- /dev/null
+++ b/setup/doctype/static_parameter_detail/static_parameter_detail.txt
@@ -0,0 +1,59 @@
+# DocType, Static Parameter Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2011-05-24 18:22:22',
+		'docstatus': 0,
+		'modified': '2011-05-24 18:42:30',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'version': 4
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Data',
+		'name': '__common__',
+		'parent': 'Static Parameter Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'reqd': 1,
+		'width': '150px'
+	},
+
+	# DocType, Static Parameter Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Static Parameter Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'parameter',
+		'idx': 1,
+		'label': 'Parameter'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'value',
+		'idx': 2,
+		'label': 'Value'
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/supplier_type/supplier_type.txt b/setup/doctype/supplier_type/supplier_type.txt
index 0190faf359..e608e6cec3 100644
--- a/setup/doctype/supplier_type/supplier_type.txt
+++ b/setup/doctype/supplier_type/supplier_type.txt
@@ -1 +1,134 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-12 12:10:22', 'search_fields': None, 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 4, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:supplier_type', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Supplier Type', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00917', 'parent': 'Supplier Type', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:54:46', 'modified': '2010-09-17 14:57:24', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 1, 'parenttype': 'DocType', 'role': 'Purchase Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00918', 'parent': 'Supplier Type', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:54:46', 'modified': '2010-09-17 14:57:24', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 2, 'parenttype': 'DocType', 'role': 'Purchase Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00919', 'parent': 'Supplier Type', 'read': 1, 'create': 0, 'creation': '2010-04-26 17:00:26', 'modified': '2010-09-17 14:57:24', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 3, 'parenttype': 'DocType', 'role': 'Purchase User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00920', 'parent': 'Supplier Type', 'read': 1, 'create': 0, 'creation': '2010-04-26 17:00:26', 'modified': '2010-09-17 14:57:24', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 4, 'parenttype': 'DocType', 'role': 'Purchase User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00224', 'parent': 'Supplier Type', 'read': 1, 'create': 1, 'creation': '2009-03-12 16:40:23', 'modified': '2010-09-17 14:57:24', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 5, 'parenttype': 'DocType', 'role': 'Purchase Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': '', 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Supplier Type', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04863', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-17 14:57:24', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:10:22', 'doctype': 'DocField', 'oldfieldname': 'supplier_type', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Supplier Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Type', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01322', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-17 14:57:24', 'parenttype': 'DocType', 'fieldname': 'supplier_type', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Supplier Type
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:26',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'yogesh@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:supplier_type',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Setup',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 3
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Supplier Type',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'amend': 0,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Supplier Type',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'submit': 0
+	},
+
+	# DocType, Supplier Type
+	{
+		'doctype': 'DocType',
+		'name': 'Supplier Type'
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Purchase Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Purchase Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Purchase User',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Purchase User',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Purchase Master Manager',
+		'write': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'supplier_type',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Supplier Type',
+		'oldfieldname': 'supplier_type',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/support_email_settings/support_email_settings.py b/setup/doctype/support_email_settings/support_email_settings.py
index 98d680e3f9..44d87350a4 100644
--- a/setup/doctype/support_email_settings/support_email_settings.py
+++ b/setup/doctype/support_email_settings/support_email_settings.py
@@ -11,8 +11,8 @@ class DocType:
 		"""
 		if cint(self.doc.integrate_incoming):
 			from webnotes.utils.scheduler import set_event
-			set_event('maintenance.doctype.support_ticket.get_support_mails', 60*5, 1)
+			set_event('support.doctype.support_ticket.get_support_mails', 60*5, 1)
 		else:
 			from webnotes.utils.scheduler import cancel_event
-			cancel_event('maintenance.doctype.support_ticket.get_support_mails')
-			
\ No newline at end of file
+			cancel_event('support.doctype.support_ticket.get_support_mails')
+			
diff --git a/setup/doctype/support_email_settings/support_email_settings.txt b/setup/doctype/support_email_settings/support_email_settings.txt
index 46a3d0faae..6079567bfa 100644
--- a/setup/doctype/support_email_settings/support_email_settings.txt
+++ b/setup/doctype/support_email_settings/support_email_settings.txt
@@ -1,369 +1,144 @@
+# DocType, Support Email Settings
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2011-05-23 14:50:45',
+		'docstatus': 0,
+		'modified': '2011-05-28 09:25:53',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
 	{
 		'_last_update': '1306554355',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-17 14:04:30',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
 		'in_dialog': 1,
-		'is_transaction_doc': None,
 		'issingle': 1,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-28 09:25:53',
-		'modified_by': 'Administrator',
 		'module': 'Setup',
-		'name': 'Support Email Settings',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
+		'name': '__common__',
 		'read_only': 1,
-		'read_only_onload': None,
-		'search_fields': None,
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': None,
 		'show_in_menu': 1,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
 		'version': 8
 	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Support Email Settings',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
 	{
-		'amend': None,
-		'cancel': None,
 		'create': 1,
-		'creation': '2011-05-17 14:04:30',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
 		'idx': 1,
-		'match': None,
-		'modified': '2011-05-28 09:25:53',
-		'modified_by': 'Administrator',
-		'name': '000000798',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'parent': 'Support Email Settings',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
 		'permlevel': 0,
 		'read': 1,
 		'role': 'System Manager',
-		'submit': None,
 		'write': 1
 	},
+
+	# DocType, Support Email Settings
+	{
+		'doctype': 'DocType',
+		'name': 'Support Email Settings'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-19 12:41:15',
-		'default': None,
-		'depends_on': None,
 		'description': 'The full email id of your incoming support emails',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'email',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 1,
-		'in_filter': None,
 		'label': 'Email',
-		'modified': '2011-05-28 09:25:53',
-		'modified_by': 'Administrator',
-		'name': '000000811',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Email',
-		'owner': 'Administrator',
-		'parent': 'Support Email Settings',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'options': 'Email'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-20 11:34:49',
-		'default': None,
-		'depends_on': None,
 		'description': 'By checking this, your incoming mails will automatically be integrated with the Support Ticket',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'integrate_incoming',
 		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
-		'in_filter': None,
-		'label': 'Integrate Incoming',
-		'modified': '2011-05-28 09:25:53',
-		'modified_by': 'Administrator',
-		'name': '000000824',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Email Settings',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Integrate Incoming'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-28 09:15:55',
-		'default': None,
-		'depends_on': None,
 		'description': 'Signature appended to the outgoing email (Text / HTML)',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'signature',
 		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
-		'in_filter': None,
-		'label': 'Signature',
-		'modified': '2011-05-28 09:25:53',
-		'modified_by': 'Administrator',
-		'name': 'FL05195',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Email Settings',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Signature'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-20 11:34:49',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-28 09:25:53',
-		'modified_by': 'Administrator',
-		'name': '000000823',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Email Settings',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'idx': 4
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-17 14:04:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'use_ssl',
 		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
 		'idx': 5,
-		'in_filter': None,
-		'label': 'Use SSL',
-		'modified': '2011-05-28 09:25:53',
-		'modified_by': 'Administrator',
-		'name': '000000799',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Email Settings',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Use SSL'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-17 14:04:30',
-		'default': None,
-		'depends_on': None,
 		'description': 'eg. pop.gmail.com',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'host',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 6,
-		'in_filter': None,
-		'label': 'Host',
-		'modified': '2011-05-28 09:25:53',
-		'modified_by': 'Administrator',
-		'name': '000000800',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Email Settings',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Host'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-17 14:04:30',
-		'default': None,
-		'depends_on': None,
 		'description': 'Support Email Id',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'username',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 7,
-		'in_filter': None,
-		'label': 'Username',
-		'modified': '2011-05-28 09:25:53',
-		'modified_by': 'Administrator',
-		'name': '000000801',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Email Settings',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Username'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-17 14:04:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'password',
 		'fieldtype': 'Password',
-		'hidden': None,
-		'icon': None,
 		'idx': 8,
-		'in_filter': None,
-		'label': 'Password',
-		'modified': '2011-05-28 09:25:53',
-		'modified_by': 'Administrator',
-		'name': '000000802',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Support Email Settings',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Password'
 	}
 ]
\ No newline at end of file
diff --git a/setup/doctype/target_detail/target_detail.txt b/setup/doctype/target_detail/target_detail.txt
index f3bbc58317..43f1d6e47b 100644
--- a/setup/doctype/target_detail/target_detail.txt
+++ b/setup/doctype/target_detail/target_detail.txt
@@ -1 +1,96 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-03-16 18:17:59', 'search_fields': None, 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 15, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Target Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-05-22 13:08:10', 'doctype': 'DocField', 'oldfieldname': 'item_group', 'owner': 'Administrator', 'reqd': 0, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Item Group', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Target Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02123', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-06-30 13:03:15', 'parenttype': 'DocType', 'fieldname': 'item_group', 'fieldtype': 'Link', 'options': 'Item Group', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-03-16 18:17:59', 'doctype': 'DocField', 'oldfieldname': 'fiscal_year', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Fiscal Year', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Target Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01419', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-06-30 13:03:15', 'parenttype': 'DocType', 'fieldname': 'fiscal_year', 'fieldtype': 'Select', 'options': 'link:Fiscal Year', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-06-22 12:03:16', 'doctype': 'DocField', 'oldfieldname': 'target_qty', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Target Qty', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Target Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05403', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-06-30 13:03:15', 'parenttype': 'DocType', 'fieldname': 'target_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-16 18:17:59', 'doctype': 'DocField', 'oldfieldname': 'target_amount', 'owner': 'Administrator', 'reqd': 0, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Target  Amount', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Target Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01420', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-06-30 13:03:15', 'parenttype': 'DocType', 'fieldname': 'target_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Target Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:26',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'abhishek@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 15
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Target Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Target Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Target Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_group',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'in_filter': 1,
+		'label': 'Item Group',
+		'oldfieldname': 'item_group',
+		'oldfieldtype': 'Link',
+		'options': 'Item Group',
+		'reqd': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'target_qty',
+		'fieldtype': 'Currency',
+		'idx': 3,
+		'label': 'Target Qty',
+		'oldfieldname': 'target_qty',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'target_amount',
+		'fieldtype': 'Currency',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Target  Amount',
+		'oldfieldname': 'target_amount',
+		'oldfieldtype': 'Currency',
+		'reqd': 0,
+		'search_index': 1
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/term/term.txt b/setup/doctype/term/term.txt
index d8bdb542fa..f169780b4d 100644
--- a/setup/doctype/term/term.txt
+++ b/setup/doctype/term/term.txt
@@ -1 +1,172 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-19 13:38:59', 'search_fields': None, 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 11, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:title', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Term', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00953', 'parent': 'Term', 'read': 1, 'create': 0, 'creation': '2010-04-26 17:10:54', 'modified': '2010-09-20 11:05:27', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 1, 'parenttype': 'DocType', 'role': 'Sales Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00954', 'parent': 'Term', 'read': 1, 'create': 1, 'creation': '2010-04-26 17:10:54', 'modified': '2010-09-20 11:05:27', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'Sales Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00966', 'parent': 'Term', 'read': 1, 'create': 0, 'creation': '2010-04-26 17:13:26', 'modified': '2010-09-20 11:05:27', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 3, 'parenttype': 'DocType', 'role': 'Sales User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00834', 'parent': 'Term', 'read': 1, 'create': 0, 'creation': '2010-04-19 13:38:59', 'modified': '2010-09-20 11:05:27', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 4, 'parenttype': 'DocType', 'role': 'Sales User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00835', 'parent': 'Term', 'read': 1, 'create': None, 'creation': '2010-04-19 13:38:59', 'modified': '2010-09-20 11:05:27', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 5, 'parenttype': 'DocType', 'role': 'All', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00837', 'parent': 'Term', 'read': 1, 'create': 1, 'creation': '2010-04-20 09:39:56', 'modified': '2010-09-20 11:05:27', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 6, 'parenttype': 'DocType', 'role': 'System Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00838', 'parent': 'Term', 'read': 1, 'create': 1, 'creation': '2010-04-20 09:39:56', 'modified': '2010-09-20 11:05:27', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 7, 'parenttype': 'DocType', 'role': 'Accounts User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Term', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04864', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 11:05:27', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-19 13:38:59', 'doctype': 'DocField', 'oldfieldname': 'title', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Title', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Term', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL04672', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 11:05:27', 'parenttype': 'DocType', 'fieldname': 'title', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text Editor', 'creation': '2010-04-19 13:38:59', 'doctype': 'DocField', 'oldfieldname': 'terms', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Terms', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Term', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04673', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-20 11:05:27', 'parenttype': 'DocType', 'fieldname': 'terms', 'fieldtype': 'Text Editor', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Term
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:27',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'yogesh@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:title',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Setup',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 10
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Term',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Term',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Term
+	{
+		'doctype': 'DocType',
+		'name': 'Term'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Sales Master Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Sales Master Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Sales User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Sales User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 1,
+		'role': 'All'
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 7,
+		'permlevel': 0,
+		'role': 'Accounts User',
+		'write': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'title',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'Title',
+		'oldfieldname': 'title',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'terms',
+		'fieldtype': 'Text Editor',
+		'idx': 3,
+		'label': 'Terms',
+		'oldfieldname': 'terms',
+		'oldfieldtype': 'Text Editor',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/territory/territory.txt b/setup/doctype/territory/territory.txt
index 52ca9c4d31..0bf94f3029 100644
--- a/setup/doctype/territory/territory.txt
+++ b/setup/doctype/territory/territory.txt
@@ -1 +1,295 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-12 12:10:06', 'search_fields': 'name,parent_territory,territory_manager', 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': 1, 'in_create': 1, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 91, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:territory_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': 'Master', 'name': 'Territory', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-22 16:00:26', 'server_code_error': ' ', 'name_case': 'Title Case', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00930', 'parent': 'Territory', 'read': 1, 'create': 0, 'creation': '2010-04-26 17:08:32', 'modified': '2010-09-22 16:00:26', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 1, 'parenttype': 'DocType', 'role': 'Sales Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00931', 'parent': 'Territory', 'read': 1, 'create': 0, 'creation': '2010-04-26 17:08:32', 'modified': '2010-09-22 16:00:26', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 2, 'parenttype': 'DocType', 'role': 'Sales Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00952', 'parent': 'Territory', 'read': 1, 'create': 0, 'creation': '2010-04-26 17:10:54', 'modified': '2010-09-22 16:00:26', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 3, 'parenttype': 'DocType', 'role': 'Sales Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00962', 'parent': 'Territory', 'read': 1, 'create': 0, 'creation': '2010-04-26 17:13:26', 'modified': '2010-09-22 16:00:26', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 4, 'parenttype': 'DocType', 'role': 'Sales User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00963', 'parent': 'Territory', 'read': 1, 'create': 0, 'creation': '2010-04-26 17:13:26', 'modified': '2010-09-22 16:00:26', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 5, 'parenttype': 'DocType', 'role': 'Sales User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': 0, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00658', 'parent': 'Territory', 'read': 1, 'create': 1, 'creation': '2010-02-01 10:10:16', 'modified': '2010-09-22 16:00:26', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 6, 'parenttype': 'DocType', 'role': 'Sales Master Manager', 'owner': 'saumil@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Territory', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04865', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-22 16:00:26', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:10:06', 'doctype': 'DocField', 'oldfieldname': 'territory_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Territory Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Territory', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01154', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-22 16:00:26', 'parenttype': 'DocType', 'fieldname': 'territory_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:10:06', 'doctype': 'DocField', 'oldfieldname': 'territory_manager', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Territory Manager', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Territory', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01161', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-22 16:00:26', 'parenttype': 'DocType', 'fieldname': 'territory_manager', 'fieldtype': 'Link', 'options': 'Sales Person', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-06-28 09:18:58', 'doctype': 'DocField', 'oldfieldname': 'parent_territory', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Parent Territory', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Territory', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05445', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-09-22 16:00:26', 'parenttype': 'DocType', 'fieldname': 'parent_territory', 'fieldtype': 'Link', 'options': 'Territory', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'HTML', 'creation': '2010-07-19 13:05:00', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'TerritoryHelp', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Territory', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05643', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-09-22 16:00:26', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': 'To manage Territory, click here', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-06-28 09:18:58', 'doctype': 'DocField', 'oldfieldname': 'is_group', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Has Child Node', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Only leaf nodes are allowed in transaction', 'parent': 'Territory', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05446', 'idx': 6, 'default': None, 'colour': 'White:FFF', 'modified': '2010-09-22 16:00:26', 'parenttype': 'DocType', 'fieldname': 'is_group', 'fieldtype': 'Select', 'options': '\nYes\nNo', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Int', 'creation': '2010-06-28 09:18:58', 'doctype': 'DocField', 'oldfieldname': 'lft', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'lft', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Territory', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL05447', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-09-22 16:00:26', 'parenttype': 'DocType', 'fieldname': 'lft', 'fieldtype': 'Int', 'options': None, 'report_hide': 0, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Int', 'creation': '2010-06-28 09:18:58', 'doctype': 'DocField', 'oldfieldname': 'rgt', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'rgt', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Territory', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL05448', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-09-22 16:00:26', 'parenttype': 'DocType', 'fieldname': 'rgt', 'fieldtype': 'Int', 'options': None, 'report_hide': 0, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2010-06-28 09:18:58', 'doctype': 'DocField', 'oldfieldname': 'old_parent', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'old_parent', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Territory', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05449', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-09-22 16:00:26', 'parenttype': 'DocType', 'fieldname': 'old_parent', 'fieldtype': 'Data', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-06-28 12:46:46', 'doctype': 'DocField', 'oldfieldname': 'distribution_id', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Distribution Id', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Territory', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05457', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-09-22 16:00:26', 'parenttype': 'DocType', 'fieldname': 'distribution_id', 'fieldtype': 'Link', 'options': 'Budget Distribution', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-06-28 09:18:58', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Target Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Territory', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05450', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-09-22 16:00:26', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Table', 'creation': '2010-06-28 09:18:58', 'doctype': 'DocField', 'oldfieldname': 'target_details', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Target Details1', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Territory', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05451', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-09-22 16:00:26', 'parenttype': 'DocType', 'fieldname': 'target_details', 'fieldtype': 'Table', 'options': 'Target Detail', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Territory
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:28',
+		'docstatus': 0,
+		'modified': '2010-12-24 12:09:17',
+		'modified_by': 'abhishek@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1307707462',
+		'allow_trash': 1,
+		'autoname': 'field:territory_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'in_create': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'name_case': 'Title Case',
+		'search_fields': 'name,parent_territory,territory_manager',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 85
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Territory',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'amend': 0,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Territory',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'submit': 0
+	},
+
+	# DocType, Territory
+	{
+		'doctype': 'DocType',
+		'name': 'Territory'
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Sales Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Sales Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Sales Master Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'Sales User',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Sales User',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 0,
+		'role': 'Sales Master Manager',
+		'write': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'territory_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Territory Name',
+		'no_copy': 1,
+		'oldfieldname': 'territory_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'territory_manager',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Territory Manager',
+		'oldfieldname': 'territory_manager',
+		'oldfieldtype': 'Link',
+		'options': 'Sales Person',
+		'permlevel': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'parent_territory',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'label': 'Parent Territory',
+		'oldfieldname': 'parent_territory',
+		'oldfieldtype': 'Link',
+		'options': 'Territory',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 5,
+		'label': 'TerritoryHelp',
+		'oldfieldtype': 'HTML',
+		'options': 'To manage Territory, click here',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Only leaf nodes are allowed in transaction',
+		'doctype': 'DocField',
+		'fieldname': 'is_group',
+		'fieldtype': 'Select',
+		'idx': 6,
+		'label': 'Has Child Node',
+		'oldfieldname': 'is_group',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'lft',
+		'fieldtype': 'Int',
+		'hidden': 1,
+		'idx': 7,
+		'in_filter': 1,
+		'label': 'lft',
+		'no_copy': 1,
+		'oldfieldname': 'lft',
+		'oldfieldtype': 'Int',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rgt',
+		'fieldtype': 'Int',
+		'hidden': 1,
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'rgt',
+		'no_copy': 1,
+		'oldfieldname': 'rgt',
+		'oldfieldtype': 'Int',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'old_parent',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 9,
+		'label': 'old_parent',
+		'no_copy': 1,
+		'oldfieldname': 'old_parent',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'distribution_id',
+		'fieldtype': 'Link',
+		'idx': 10,
+		'label': 'Distribution Id',
+		'oldfieldname': 'distribution_id',
+		'oldfieldtype': 'Link',
+		'options': 'Budget Distribution',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 11,
+		'label': 'Target Details',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'target_details',
+		'fieldtype': 'Table',
+		'idx': 12,
+		'label': 'Target Details1',
+		'oldfieldname': 'target_details',
+		'oldfieldtype': 'Table',
+		'options': 'Target Detail',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/uom/uom.txt b/setup/doctype/uom/uom.txt
index 51423b94ca..7918322cbe 100644
--- a/setup/doctype/uom/uom.txt
+++ b/setup/doctype/uom/uom.txt
@@ -1 +1,145 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-03-12 12:09:44', 'search_fields': None, 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 6, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:uom_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'UOM', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00872', 'parent': 'UOM', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:48:34', 'modified': '2010-09-20 11:07:40', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 1, 'parenttype': 'DocType', 'role': 'Material Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00873', 'parent': 'UOM', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:48:34', 'modified': '2010-09-20 11:07:40', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 2, 'parenttype': 'DocType', 'role': 'Material Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00897', 'parent': 'UOM', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:52:07', 'modified': '2010-09-20 11:07:40', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 3, 'parenttype': 'DocType', 'role': 'Material User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00898', 'parent': 'UOM', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:52:07', 'modified': '2010-09-20 11:07:40', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 4, 'parenttype': 'DocType', 'role': 'Material User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': 0, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00223', 'parent': 'UOM', 'read': 1, 'create': 1, 'creation': '2009-03-12 15:59:30', 'modified': '2010-09-20 11:07:40', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 5, 'parenttype': 'DocType', 'role': 'Material Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': '', 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'UOM', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04866', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 11:07:40', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-03-17 15:16:18', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'UOM Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'UOM', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04114', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 11:07:40', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:44', 'doctype': 'DocField', 'oldfieldname': 'uom_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'UOM Name', 'width': '', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'UOM', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00659', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-20 11:07:40', 'parenttype': 'DocType', 'fieldname': 'uom_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, UOM
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:29',
+		'docstatus': 0,
+		'modified': '2010-12-24 15:14:23',
+		'modified_by': 'abhishek@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1307707462',
+		'allow_trash': 1,
+		'autoname': 'field:uom_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Setup',
+		'name': '__common__',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 5
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'UOM',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'amend': 0,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'UOM',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'submit': 0
+	},
+
+	# DocType, UOM
+	{
+		'doctype': 'DocType',
+		'name': 'UOM'
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Material Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Material Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Material User',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Material User',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Material Master Manager',
+		'write': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 2,
+		'label': 'UOM Details',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'uom_name',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'UOM Name',
+		'oldfieldname': 'uom_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/chapter_vi_a_detail/__init__.py b/setup/doctype/update_series/__init__.py
similarity index 100%
rename from payroll/doctype/chapter_vi_a_detail/__init__.py
rename to setup/doctype/update_series/__init__.py
diff --git a/setup/doctype/update_series/update_series.txt b/setup/doctype/update_series/update_series.txt
new file mode 100644
index 0000000000..b3203be399
--- /dev/null
+++ b/setup/doctype/update_series/update_series.txt
@@ -0,0 +1,104 @@
+# DocType, Update Series
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:29',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_copy': 1,
+		'allow_email': 1,
+		'allow_print': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'hide_toolbar': 0,
+		'in_create': 1,
+		'issingle': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'read_only': 1,
+		'section_style': 'Simple',
+		'server_code': 'class DocType:\n  def __init__(self, doc, doclist=[]):\n    self.doc = doc\n    self.doclist = doclist\n\n  def update_series(self):\n    series = sql("select name,current from `tabSeries` where name = %s", self.doc.prefix,as_dict = 1)\n    if series:\n      msgprint("This is going to update Series with Prefix : " + series[0][\'name\'] + " from Current : " + cstr(series[0][\'current\']) + " to Current : "+ cstr(self.doc.current))\n      sql("update `tabSeries` set current = \'%s\' where name = \'%s\'" % (self.doc.current,series[0][\'name\']))\n      msgprint("Series Updated Successfully")\n    else:\n      msgprint("Please Check Prefix as there is no such Prefix : "+ self.doc.prefix +" Or Try Insert Button")\n\n  def insert_series(self):\n    #sql("start transaction")\n    series = sql("select name,current from `tabSeries` where name = %s", self.doc.prefix, as_dict = 1)\n    if series:\n      msgprint("Series with Prefix : " + series[0][\'name\'] + "already in the system . Try Update Button")\n    else:\n      msgprint("This is going to Insert Series with Prefix : " + cstr(self.doc.prefix) + " Current: " + cstr(self.doc.current))\n      sql("insert into `tabSeries` (name,current) values (\'%s\',\'%s\')" % (self.doc.prefix, self.doc.current))\n      msgprint("Series Inserted Successfully")',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 5
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Update Series',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'Update Series',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocType, Update Series
+	{
+		'doctype': 'DocType',
+		'name': 'Update Series'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'prefix',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Prefix'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'current',
+		'fieldtype': 'Int',
+		'idx': 2,
+		'label': 'Current'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 3,
+		'label': 'Update',
+		'options': 'update_series'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 4,
+		'label': 'Insert',
+		'options': 'insert_series'
+	}
+]
\ No newline at end of file
diff --git a/setup/doctype/warehouse_type/warehouse_type.txt b/setup/doctype/warehouse_type/warehouse_type.txt
index 9a05c2b898..c843838dcf 100644
--- a/setup/doctype/warehouse_type/warehouse_type.txt
+++ b/setup/doctype/warehouse_type/warehouse_type.txt
@@ -1 +1,136 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-12 12:09:44', 'search_fields': '', 'module': 'Setup', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 8, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 0, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:warehouse_type', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': '', 'name': 'Warehouse Type', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-22 10:52:43', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00878', 'parent': 'Warehouse Type', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:48:34', 'modified': '2010-09-22 10:52:43', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 1, 'parenttype': 'DocType', 'role': 'Material Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00879', 'parent': 'Warehouse Type', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:48:34', 'modified': '2010-09-22 10:52:43', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 2, 'parenttype': 'DocType', 'role': 'Material Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00903', 'parent': 'Warehouse Type', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:52:07', 'modified': '2010-09-22 10:52:43', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 3, 'parenttype': 'DocType', 'role': 'Material User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00904', 'parent': 'Warehouse Type', 'read': 1, 'create': 0, 'creation': '2010-04-26 16:52:07', 'modified': '2010-09-22 10:52:43', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 4, 'parenttype': 'DocType', 'role': 'Material User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': 0, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00212', 'parent': 'Warehouse Type', 'read': 1, 'create': 1, 'creation': '2009-03-12 15:13:34', 'modified': '2010-09-22 10:52:43', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 5, 'parenttype': 'DocType', 'role': 'Material Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': '', 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Warehouse Type', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04868', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-22 10:52:43', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:09:44', 'doctype': 'DocField', 'oldfieldname': 'warehouse_type', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Warehouse Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Warehouse Type', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL00676', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-22 10:52:43', 'parenttype': 'DocType', 'fieldname': 'warehouse_type', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
+# DocType, Warehouse Type
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:30',
+		'docstatus': 0,
+		'modified': '2010-09-22 10:52:43',
+		'modified_by': 'yogesh@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:warehouse_type',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 0,
+		'module': 'Setup',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 6
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Warehouse Type',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'amend': 0,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Warehouse Type',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'submit': 0
+	},
+
+	# DocType, Warehouse Type
+	{
+		'doctype': 'DocType',
+		'name': 'Warehouse Type'
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Material Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Material Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Material User',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Material User',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Material Master Manager',
+		'write': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'warehouse_type',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'Warehouse Type',
+		'oldfieldname': 'warehouse_type',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/city/__init__.py b/setup/doctype/workflow_action_detail/__init__.py
similarity index 100%
rename from payroll/doctype/city/__init__.py
rename to setup/doctype/workflow_action_detail/__init__.py
diff --git a/setup/doctype/workflow_action_detail/workflow_action_detail.txt b/setup/doctype/workflow_action_detail/workflow_action_detail.txt
new file mode 100644
index 0000000000..26028af7cf
--- /dev/null
+++ b/setup/doctype/workflow_action_detail/workflow_action_detail.txt
@@ -0,0 +1,63 @@
+# DocType, Workflow Action Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:30',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'swarnalata@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'version': 5
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Workflow Action Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'width': '200px'
+	},
+
+	# DocType, Workflow Action Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Workflow Action Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'action_field',
+		'fieldtype': 'Select',
+		'idx': 1,
+		'label': 'Field',
+		'oldfieldname': 'action_field',
+		'oldfieldtype': 'Select'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'action_value',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Value',
+		'oldfieldname': 'action_value',
+		'oldfieldtype': 'Data'
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/condition_detail/__init__.py b/setup/doctype/workflow_engine/__init__.py
similarity index 100%
rename from payroll/doctype/condition_detail/__init__.py
rename to setup/doctype/workflow_engine/__init__.py
diff --git a/settings/doctype/workflow_engine/workflow_engine.py b/setup/doctype/workflow_engine/workflow_engine.py
similarity index 100%
rename from settings/doctype/workflow_engine/workflow_engine.py
rename to setup/doctype/workflow_engine/workflow_engine.py
diff --git a/setup/doctype/workflow_engine/workflow_engine.txt b/setup/doctype/workflow_engine/workflow_engine.txt
new file mode 100644
index 0000000000..5b090c8bec
--- /dev/null
+++ b/setup/doctype/workflow_engine/workflow_engine.txt
@@ -0,0 +1,31 @@
+# DocType, Workflow Engine
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:31',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'swarnalata@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 4
+	},
+
+	# DocType, Workflow Engine
+	{
+		'doctype': 'DocType',
+		'name': 'Workflow Engine'
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/declaration_detail/__init__.py b/setup/doctype/workflow_rule/__init__.py
similarity index 100%
rename from payroll/doctype/declaration_detail/__init__.py
rename to setup/doctype/workflow_rule/__init__.py
diff --git a/settings/doctype/workflow_rule/workflow_rule.js b/setup/doctype/workflow_rule/workflow_rule.js
similarity index 100%
rename from settings/doctype/workflow_rule/workflow_rule.js
rename to setup/doctype/workflow_rule/workflow_rule.js
diff --git a/settings/doctype/workflow_rule/workflow_rule.py b/setup/doctype/workflow_rule/workflow_rule.py
similarity index 100%
rename from settings/doctype/workflow_rule/workflow_rule.py
rename to setup/doctype/workflow_rule/workflow_rule.py
diff --git a/setup/doctype/workflow_rule/workflow_rule.txt b/setup/doctype/workflow_rule/workflow_rule.txt
new file mode 100644
index 0000000000..d95a481be0
--- /dev/null
+++ b/setup/doctype/workflow_rule/workflow_rule.txt
@@ -0,0 +1,258 @@
+# DocType, Workflow Rule
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:31',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'swarnalata@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308741898',
+		'autoname': 'field:rule_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Setup',
+		'name': '__common__',
+		'search_fields': 'select_form,rule_status',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 30
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Workflow Rule',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'Workflow Rule',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocType, Workflow Rule
+	{
+		'doctype': 'DocType',
+		'name': 'Workflow Rule'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Rule Definition',
+		'oldfieldtype': 'Section Break'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 2,
+		'label': 'Intro HTML',
+		'oldfieldtype': 'HTML',
+		'options': 'Select form for which you want to define rules,set priority & status.'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rule_name',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Rule Name',
+		'oldfieldname': 'rule_name',
+		'oldfieldtype': 'Data',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'rule_status',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Rule Status',
+		'oldfieldname': 'rule_status',
+		'oldfieldtype': 'Select',
+		'options': '\nActive\nInactive',
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'select_form',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Select Form',
+		'oldfieldname': 'select_form',
+		'oldfieldtype': 'Link',
+		'options': 'DocType',
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rule_priority',
+		'fieldtype': 'Int',
+		'idx': 6,
+		'label': 'Rule Priority',
+		'oldfieldname': 'rule_priority',
+		'oldfieldtype': 'Int',
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 7,
+		'label': 'Define Rule',
+		'oldfieldtype': 'Section Break',
+		'options': 'Simple'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'workflow_rule_details',
+		'fieldtype': 'Table',
+		'idx': 8,
+		'label': 'Workflow Rule Details',
+		'oldfieldname': 'workflow_rule_details',
+		'oldfieldtype': 'Table',
+		'options': 'Workflow Rule Detail',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'extra_condition',
+		'fieldtype': 'Code',
+		'hidden': 1,
+		'idx': 9,
+		'label': 'Extra Condition',
+		'oldfieldname': 'extra_condition',
+		'oldfieldtype': 'Code',
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 10,
+		'label': 'Action Detail',
+		'oldfieldtype': 'Section Break'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 11,
+		'label': 'Action html',
+		'oldfieldtype': 'HTML',
+		'options': 'Specify actions to be taken  when conditions hold satisfied'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'workflow_action_details',
+		'fieldtype': 'Table',
+		'idx': 12,
+		'label': 'Workflow Action Details',
+		'oldfieldname': 'workflow_action_details',
+		'oldfieldtype': 'Table',
+		'options': 'Workflow Action Detail'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'hidden': 1,
+		'idx': 13,
+		'label': 'Reject HTML',
+		'no_copy': 1,
+		'oldfieldtype': 'HTML',
+		'options': "If any condition holds false the following message will be displayed . If you wish to stop rule engine when condition holds false then set 'Raise Exception' as 'Yes' otherwise keep this field blank or 'No'.",
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'message',
+		'fieldtype': 'Text',
+		'hidden': 1,
+		'idx': 14,
+		'label': 'Enter message',
+		'no_copy': 1,
+		'oldfieldname': 'message',
+		'oldfieldtype': 'Text',
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'raise_exception',
+		'fieldtype': 'Select',
+		'hidden': 1,
+		'idx': 15,
+		'label': 'Raise Exception',
+		'no_copy': 1,
+		'oldfieldname': 'raise_exception',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'print_hide': 1,
+		'report_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/deduction_detail/__init__.py b/setup/doctype/workflow_rule_detail/__init__.py
similarity index 100%
rename from payroll/doctype/deduction_detail/__init__.py
rename to setup/doctype/workflow_rule_detail/__init__.py
diff --git a/setup/doctype/workflow_rule_detail/workflow_rule_detail.txt b/setup/doctype/workflow_rule_detail/workflow_rule_detail.txt
new file mode 100644
index 0000000000..3f22040fcc
--- /dev/null
+++ b/setup/doctype/workflow_rule_detail/workflow_rule_detail.txt
@@ -0,0 +1,112 @@
+# DocType, Workflow Rule Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:31',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'swarnalata@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Setup',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'version': 9
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Workflow Rule Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Workflow Rule Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Workflow Rule Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rule_field',
+		'fieldtype': 'Select',
+		'idx': 1,
+		'label': 'Field',
+		'oldfieldname': 'rule_field',
+		'oldfieldtype': 'Select',
+		'options': '[]',
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'operator',
+		'fieldtype': 'Select',
+		'idx': 2,
+		'label': 'Operator',
+		'oldfieldname': 'operator',
+		'oldfieldtype': 'Select',
+		'options': '\nequal\nnot equal\ngreater than\ngreater than equal\nless than\nless than equal'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'value',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Value',
+		'oldfieldname': 'value',
+		'oldfieldtype': 'Data',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'comparing_field',
+		'fieldtype': 'Select',
+		'idx': 4,
+		'label': 'Field from other forms',
+		'oldfieldname': 'comparing_field',
+		'oldfieldtype': 'Select'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'message',
+		'fieldtype': 'Data',
+		'idx': 5,
+		'label': 'Message when Cond. False',
+		'oldfieldname': 'message',
+		'oldfieldtype': 'Data',
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'exception',
+		'fieldtype': 'Select',
+		'idx': 6,
+		'label': 'Raise Exception',
+		'oldfieldname': 'exception',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo'
+	}
+]
\ No newline at end of file
diff --git a/setup/page/import_data/import_data.txt b/setup/page/import_data/import_data.txt
index b422f12e1e..40baa6b14d 100644
--- a/setup/page/import_data/import_data.txt
+++ b/setup/page/import_data/import_data.txt
@@ -1,106 +1,72 @@
+# Page, Import Data
 [
+
+	# These values are common in all dictionaries
 	{
-		'author': None,
-		'category': 'Standard',
-		'content': None,
-		'creation': '2010-12-14 10:33:09',
+		'creation': '2010-12-14 10:23:18',
 		'docstatus': 0,
-		'doctype': 'Page',
-		'file_list': None,
-		'icon': None,
-		'idx': None,
-		'keywords': None,
-		'menu_index': None,
-		'modified': '2011-05-02 16:28:00',
+		'modified': '2010-12-24 11:43:02',
 		'modified_by': 'Administrator',
-		'module': 'Setup',
-		'name': 'Import Data',
-		'owner': 'Administrator',
-		'page_name': 'Import Data',
-		'page_title': None,
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'publish': None,
-		'script': None,
-		'show_in_menu': 0,
-		'site_description': None,
-		'standard': 'Yes',
-		'static_content': None,
-		'style': None,
-		'stylesheet': None,
-		'template': None,
-		'write_content': None
+		'owner': 'Administrator'
 	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
+		'module': 'Setup',
+		'name': '__common__',
+		'page_name': 'Import Data',
+		'show_in_menu': 0,
+		'standard': 'Yes'
+	},
+
+	# These values are common for all Page Role
+	{
+		'doctype': 'Page Role',
+		'name': '__common__',
+		'parent': 'Import Data',
+		'parentfield': 'roles',
+		'parenttype': 'Page'
+	},
+
+	# Page, Import Data
+	{
+		'doctype': 'Page',
+		'name': 'Import Data'
+	},
+
+	# Page Role
 	{
-		'creation': '2010-12-14 10:33:09',
-		'docstatus': 0,
 		'doctype': 'Page Role',
 		'idx': 1,
-		'modified': '2011-05-02 16:28:00',
-		'modified_by': 'Administrator',
-		'name': 'PR000224',
-		'owner': 'Administrator',
-		'parent': 'Import Data',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
 		'role': 'Administrator'
 	},
+
+	# Page Role
 	{
-		'creation': '2010-12-14 10:33:09',
-		'docstatus': 0,
 		'doctype': 'Page Role',
 		'idx': 2,
-		'modified': '2011-05-02 16:28:00',
-		'modified_by': 'Administrator',
-		'name': 'PR000225',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Import Data',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
 		'role': 'System Manager'
 	},
+
+	# Page Role
 	{
-		'creation': '2010-12-14 10:33:09',
-		'docstatus': 0,
 		'doctype': 'Page Role',
 		'idx': 3,
-		'modified': '2011-05-02 16:28:00',
-		'modified_by': 'Administrator',
-		'name': 'PR000226',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Import Data',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
 		'role': 'Sales Master Manager'
 	},
+
+	# Page Role
 	{
-		'creation': '2010-12-14 10:33:09',
-		'docstatus': 0,
 		'doctype': 'Page Role',
 		'idx': 4,
-		'modified': '2011-05-02 16:28:00',
-		'modified_by': 'Administrator',
-		'name': 'PR000227',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Import Data',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
 		'role': 'Purchase Master Manager'
 	},
+
+	# Page Role
 	{
-		'creation': '2010-12-14 10:33:09',
-		'docstatus': 0,
 		'doctype': 'Page Role',
 		'idx': 5,
-		'modified': '2011-05-02 16:28:00',
-		'modified_by': 'Administrator',
-		'name': 'PR000228',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Import Data',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
 		'role': 'Material Master Manager'
 	}
 ]
\ No newline at end of file
diff --git a/setup/page/permission_engine/permission_engine.txt b/setup/page/permission_engine/permission_engine.txt
index 72ef01cc48..6f95211ab5 100644
--- a/setup/page/permission_engine/permission_engine.txt
+++ b/setup/page/permission_engine/permission_engine.txt
@@ -1 +1,44 @@
-[{'creation': '2010-01-07 10:44:43', 'module': 'Setup', 'doctype': 'Page', 'owner': 'saumil@webnotestech.com', 'style': None, 'modified_by': 'Administrator', 'script': None, 'show_in_menu': 1, 'content': None, 'page_name': 'Permission Engine', 'menu_index': None, 'docstatus': 0, 'parent': None, 'standard': 'Yes', 'icon': None, 'name': 'Permission Engine', 'idx': None, 'static_content': None, 'modified': '2010-11-18 20:24:21', 'parenttype': None, 'parent_node': None, 'parentfield': None}, {'modified_by': 'Administrator', 'name': 'PR000107', 'parent': 'Permission Engine', 'creation': '2010-01-07 11:10:21', 'modified': '2010-11-18 20:24:21', 'doctype': 'Page Role', 'idx': 1, 'parenttype': 'Page', 'role': 'System Manager', 'owner': 'saumil@webnotestech.com', 'docstatus': 0, 'parentfield': 'roles'}]
\ No newline at end of file
+# Page, Permission Engine
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-12-14 10:23:18',
+		'docstatus': 0,
+		'modified': '2011-01-04 13:11:17',
+		'modified_by': 'Administrator',
+		'owner': 'saumil@webnotestech.com'
+	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
+		'module': 'Setup',
+		'name': '__common__',
+		'page_name': 'Permission Engine',
+		'show_in_menu': 1,
+		'standard': 'Yes'
+	},
+
+	# These values are common for all Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'Permission Engine',
+		'parentfield': 'roles',
+		'parenttype': 'Page',
+		'role': 'System Manager'
+	},
+
+	# Page, Permission Engine
+	{
+		'doctype': 'Page',
+		'name': 'Permission Engine'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role'
+	}
+]
\ No newline at end of file
diff --git a/setup/page/setup/setup.txt b/setup/page/setup/setup.txt
index f2a7a70a94..0b9a13399f 100644
--- a/setup/page/setup/setup.txt
+++ b/setup/page/setup/setup.txt
@@ -1 +1,27 @@
-[{'creation': '2010-07-13 13:42:28', 'module': 'Setup', 'doctype': 'Page', 'owner': 'Administrator', 'style': None, 'modified_by': 'harshada@webnotestech.com', 'script': None, 'show_in_menu': None, 'content': None, 'page_name': 'Setup', 'menu_index': None, 'docstatus': 0, 'parent': None, 'standard': 'Yes', 'icon': None, 'name': 'Setup', 'idx': None, 'static_content': None, 'modified': '2010-11-24 16:25:07', 'parenttype': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
+# Page, Setup
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-12-16 23:46:03',
+		'docstatus': 0,
+		'modified': '2010-12-18 13:30:38',
+		'modified_by': 'yogesh@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
+		'module': 'Setup',
+		'name': '__common__',
+		'page_name': 'Setup',
+		'standard': 'Yes'
+	},
+
+	# Page, Setup
+	{
+		'doctype': 'Page',
+		'name': 'Setup'
+	}
+]
\ No newline at end of file
diff --git a/setup/page/setup_wizard/setup_wizard.txt b/setup/page/setup_wizard/setup_wizard.txt
index e79cc5479e..40175868cb 100644
--- a/setup/page/setup_wizard/setup_wizard.txt
+++ b/setup/page/setup_wizard/setup_wizard.txt
@@ -1 +1,44 @@
-[{'creation': '2010-04-26 11:03:08', 'module': 'Setup', 'doctype': 'Page', 'owner': 'Administrator', 'style': None, 'modified_by': 'Administrator', 'script': None, 'show_in_menu': 0, 'content': None, 'page_name': 'Setup Wizard', 'menu_index': None, 'docstatus': 0, 'parent': None, 'standard': 'Yes', 'icon': None, 'name': 'Setup Wizard', 'idx': None, 'static_content': None, 'modified': '2010-09-25 00:00:00', 'parenttype': None, 'parent_node': None, 'parentfield': None}, {'modified_by': 'Administrator', 'name': 'PR000127', 'parent': 'Setup Wizard', 'creation': '2010-04-26 13:35:08', 'modified': '2010-07-13 13:36:23', 'doctype': 'Page Role', 'idx': 1, 'parenttype': 'Page', 'role': 'System Manager', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': 'roles'}]
\ No newline at end of file
+# Page, Setup Wizard
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-10-12 15:19:32',
+		'docstatus': 0,
+		'modified': '2010-09-25 00:00:00',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
+		'module': 'Setup',
+		'name': '__common__',
+		'page_name': 'Setup Wizard',
+		'show_in_menu': 0,
+		'standard': 'Yes'
+	},
+
+	# These values are common for all Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'Setup Wizard',
+		'parentfield': 'roles',
+		'parenttype': 'Page',
+		'role': 'System Manager'
+	},
+
+	# Page, Setup Wizard
+	{
+		'doctype': 'Page',
+		'name': 'Setup Wizard'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role'
+	}
+]
\ No newline at end of file
diff --git a/setup/page/webforms/webforms.txt b/setup/page/webforms/webforms.txt
index 63a8289233..8e2970bf41 100644
--- a/setup/page/webforms/webforms.txt
+++ b/setup/page/webforms/webforms.txt
@@ -1 +1,51 @@
-[{'creation': '2010-12-18 17:10:03', 'module': 'Setup', 'doctype': 'Page', 'owner': 'Administrator', 'style': None, 'modified_by': 'Administrator', 'script': None, 'show_in_menu': None, 'content': None, 'page_name': 'Webforms', 'menu_index': None, 'docstatus': 0, 'parent': None, 'standard': 'Yes', 'icon': None, 'name': 'Webforms', 'idx': None, 'static_content': None, 'modified': '2010-12-18 17:14:25', 'parenttype': None, 'parent_node': None, 'parentfield': None}, {'modified_by': 'Administrator', 'name': 'PR000075', 'parent': 'Webforms', 'creation': '2010-12-18 17:11:12', 'modified': '2010-12-18 17:14:25', 'doctype': 'Page Role', 'idx': 1, 'parenttype': 'Page', 'role': 'All', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': 'roles'}]
\ No newline at end of file
+# Page, Webforms
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-10-14 11:15:59',
+		'docstatus': 0,
+		'modified': '2011-01-04 13:19:54',
+		'modified_by': 'Administrator',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
+		'module': 'Setup',
+		'name': '__common__',
+		'page_name': 'Webforms',
+		'show_in_menu': 1,
+		'standard': 'Yes'
+	},
+
+	# These values are common for all Page Role
+	{
+		'doctype': 'Page Role',
+		'name': '__common__',
+		'parent': 'Webforms',
+		'parentfield': 'roles',
+		'parenttype': 'Page'
+	},
+
+	# Page, Webforms
+	{
+		'doctype': 'Page',
+		'name': 'Webforms'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 1,
+		'role': 'Administrator'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 2,
+		'role': 'System Manager'
+	}
+]
\ No newline at end of file
diff --git a/srm/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt b/srm/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt
deleted file mode 100644
index 15b9c3f130..0000000000
--- a/srm/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt	
+++ /dev/null
@@ -1 +0,0 @@
-[{'modified_by': 'saumil@webnotestech.com', 'name': 'Purchase Order-Payable Voucher', 'parent': None, 'to_doctype': 'Payable Voucher', 'creation': '2009-03-12 12:10:22', 'modified': '2010-10-18 16:11:50', 'module': 'SRM', 'doctype': 'DocType Mapper', 'idx': None, 'parenttype': None, 'ref_doc_submitted': 1, 'owner': 'Administrator', 'docstatus': 0, 'from_doctype': 'Purchase Order', 'parentfield': None}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00123', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'company', 'creation': '2009-03-12 12:10:22', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'company', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00124', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'fiscal_year', 'creation': '2009-03-12 12:10:22', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 2, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'fiscal_year', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00125', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'conversion_rate', 'creation': '2009-03-12 12:10:22', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 3, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'conversion_rate', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00348', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'currency', 'creation': '2009-06-25 20:08:36', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 4, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'currency', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00131', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'supplier', 'creation': '2009-03-12 12:10:22', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 5, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'supplier', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00899', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'supplier_name', 'creation': '2010-08-26 16:35:01', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 6, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'supplier_name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00126', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'item_code', 'creation': '2009-03-12 12:10:22', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 7, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'item_code', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00252', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'item_name', 'creation': '2009-03-25 17:39:39', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 8, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'item_name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00251', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'brand', 'creation': '2009-03-25 17:39:39', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 9, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'brand', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00130', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'qty', 'creation': '2009-03-12 12:10:22', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 10, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'eval: flt(obj.qty) - flt(obj.billed_qty)', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00127', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'rate', 'creation': '2009-03-12 12:10:22', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 11, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'purchase_rate', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00597', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'amount', 'creation': '2009-10-27 10:46:42', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 12, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.purchase_rate)', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00347', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'import_rate', 'creation': '2009-06-25 17:05:10', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 13, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'import_rate', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00706', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'import_amount', 'creation': '2010-05-24 12:22:49', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 14, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.import_rate)', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00128', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'description', 'creation': '2009-03-12 12:10:22', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 15, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'description', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00129', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'purchase_order', 'creation': '2009-03-12 12:10:22', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 16, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'parent', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00236', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'po_detail', 'creation': '2009-03-18 06:32:14', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 17, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00651', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'item_group', 'creation': '2009-12-22 16:54:46', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 18, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'from_field': 'item_group', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00677', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'category', 'creation': '2010-02-05 17:09:42', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 19, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'from_field': 'category', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00678', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'add_deduct_tax', 'creation': '2010-02-05 17:09:42', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 20, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'from_field': 'add_deduct_tax', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00679', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'charge_type', 'creation': '2010-02-05 17:09:42', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 21, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'from_field': 'charge_type', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00680', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'row_id', 'creation': '2010-02-05 17:09:42', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 22, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'from_field': 'row_id', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00681', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'item_wise_tax_detail', 'creation': '2010-02-05 17:09:42', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 23, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'from_field': 'item_wise_tax_detail', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00682', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'description', 'creation': '2010-02-05 17:09:42', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 24, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'from_field': 'description', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00683', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'account_head', 'creation': '2010-02-05 17:09:42', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 25, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'from_field': 'account_head', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00684', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'cost_center', 'creation': '2010-02-05 17:09:42', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 26, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'from_field': 'cost_center', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00685', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'rate', 'creation': '2010-02-05 17:09:42', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 27, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'from_field': 'rate', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'saumil@webnotestech.com', 'name': 'FMD/00873', 'parent': 'Purchase Order-Payable Voucher', 'to_field': 'project_name', 'creation': '2010-08-18 15:28:54', 'modified': '2010-10-18 16:11:50', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 28, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'project_name', 'parentfield': 'field_mapper_details'}, {'reference_key': '', 'modified_by': 'saumil@webnotestech.com', 'name': 'TMD/0000013', 'parent': 'Purchase Order-Payable Voucher', 'is_reference_table': None, 'to_field': None, 'creation': '2009-03-12 12:10:22', 'reference_doctype_key': '', 'modified': '2010-10-18 16:11:50', 'doctype': 'Table Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'from_table': 'Purchase Order', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'Payable Voucher', 'from_field': '', 'validation_logic': 'docstatus =1', 'parentfield': 'table_mapper_details'}, {'reference_key': '', 'modified_by': 'saumil@webnotestech.com', 'name': 'TMD/0000014', 'parent': 'Purchase Order-Payable Voucher', 'is_reference_table': None, 'to_field': 'entries', 'creation': '2009-03-12 12:10:22', 'reference_doctype_key': '', 'modified': '2010-10-18 16:11:50', 'doctype': 'Table Mapper Detail', 'match_id': 1, 'idx': 2, 'parenttype': 'DocType Mapper', 'from_table': 'PO Detail', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'PV Detail', 'from_field': 'po_details', 'validation_logic': 'ifnull(billed_qty,0)  < qty', 'parentfield': 'table_mapper_details'}, {'reference_key': '', 'modified_by': 'saumil@webnotestech.com', 'name': 'TMD/0000065', 'parent': 'Purchase Order-Payable Voucher', 'is_reference_table': None, 'to_field': 'purchase_tax_details', 'creation': '2010-02-05 17:09:42', 'reference_doctype_key': '', 'modified': '2010-10-18 16:11:50', 'doctype': 'Table Mapper Detail', 'match_id': 2, 'idx': 3, 'parenttype': 'DocType Mapper', 'from_table': 'Purchase Tax Detail', 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'to_table': 'Purchase Tax Detail', 'from_field': 'purchase_tax_details', 'validation_logic': 'docstatus =1', 'parentfield': 'table_mapper_details'}]
\ No newline at end of file
diff --git a/srm/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt b/srm/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
deleted file mode 100644
index bfb756ee21..0000000000
--- a/srm/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt	
+++ /dev/null
@@ -1,802 +0,0 @@
-[
-	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'DocType Mapper',
-		'from_doctype': 'Purchase Order',
-		'idx': None,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'module': 'SRM',
-		'name': 'Purchase Order-Purchase Receipt',
-		'owner': 'Administrator',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
-		'ref_doc_submitted': 1,
-		'to_doctype': 'Purchase Receipt'
-	},
-	{
-		'checking_operator': '=',
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'supplier',
-		'idx': 1,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00197',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'supplier'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-09-01 15:48:10',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'supplier_name',
-		'idx': 2,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00586',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'supplier_name'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'supplier_address',
-		'idx': 3,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00198',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'supplier_address'
-	},
-	{
-		'checking_operator': '=',
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'company',
-		'idx': 4,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00199',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'company'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'fiscal_year',
-		'idx': 5,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00200',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'fiscal_year'
-	},
-	{
-		'checking_operator': '=',
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'currency',
-		'idx': 6,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00201',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'currency'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-09 09:44:02',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'terms',
-		'idx': 7,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00553',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'terms'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'warehouse',
-		'idx': 8,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00202',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'warehouse'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'conversion_factor',
-		'idx': 9,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00203',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'conversion_factor'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'stock_uom',
-		'idx': 10,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00204',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'stock_uom'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'name',
-		'idx': 11,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00205',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'prevdoc_detail_docname'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'parent',
-		'idx': 12,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00206',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'prevdoc_docname'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'parenttype',
-		'idx': 13,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00207',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'prevdoc_doctype'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'uom',
-		'idx': 14,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00208',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'uom'
-	},
-	{
-		'checking_operator': '=',
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'item_code',
-		'idx': 15,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00209',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'item_code'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'brand',
-		'idx': 16,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00210',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'brand'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'item_name',
-		'idx': 17,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00211',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'item_name'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'eval:(flt(obj.qty) - flt(obj.received_qty)) ',
-		'idx': 18,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00212',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'received_qty'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'eval:(flt(obj.qty) - flt(obj.received_qty)) ',
-		'idx': 19,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00213',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'qty'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'eval:(flt(obj.qty) - flt(obj.received_qty)) * flt(obj.conversion_factor)',
-		'idx': 20,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00214',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'stock_qty'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'purchase_rate',
-		'idx': 21,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00215',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'purchase_rate'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'item_group',
-		'idx': 22,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00217',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'item_group'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'import_rate',
-		'idx': 23,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00218',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'import_rate'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'eval:(flt(obj.qty) - flt(obj.received_qty)) * flt(obj.import_rate)',
-		'idx': 24,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00219',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'import_amount'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'schedule_date',
-		'idx': 25,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00220',
-		'owner': 'jitesh',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'schedule_date'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'eval:(flt(obj.qty) - flt(obj.received_qty)) * flt(obj.purchase_rate)',
-		'idx': 26,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00221',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'amount'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-03-23 11:40:19',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'item_tax_rate',
-		'idx': 27,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': '000003203',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'item_tax_rate'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'conversion_rate',
-		'idx': 28,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00222',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'conversion_rate'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'category',
-		'idx': 29,
-		'map': 'Yes',
-		'match_id': 2,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00223',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'category'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'add_deduct_tax',
-		'idx': 30,
-		'map': 'Yes',
-		'match_id': 2,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00224',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'add_deduct_tax'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'charge_type',
-		'idx': 31,
-		'map': 'Yes',
-		'match_id': 2,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00225',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'charge_type'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'row_id',
-		'idx': 32,
-		'map': 'Yes',
-		'match_id': 2,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00226',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'row_id'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'description',
-		'idx': 33,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00228',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'description'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'item_wise_tax_detail',
-		'idx': 34,
-		'map': 'Yes',
-		'match_id': 2,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00227',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'item_wise_tax_detail'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'description',
-		'idx': 35,
-		'map': 'Yes',
-		'match_id': 2,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00216',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'description'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'account_head',
-		'idx': 36,
-		'map': 'Yes',
-		'match_id': 2,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00229',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'account_head'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'cost_center',
-		'idx': 37,
-		'map': 'Yes',
-		'match_id': 2,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00230',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'cost_center'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'rate',
-		'idx': 38,
-		'map': 'Yes',
-		'match_id': 2,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00231',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'rate'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'contact_person',
-		'idx': 39,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00232',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'contact_person'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-09-01 15:48:10',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'project_name',
-		'idx': 40,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00587',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'project_name'
-	},
-	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Table Mapper Detail',
-		'from_field': 'po_details',
-		'from_table': 'PO Detail',
-		'idx': 1,
-		'match_id': 1,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000025',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': 'prevdoc_doctype',
-		'reference_key': 'prevdoc_detail_docname',
-		'to_field': 'purchase_receipt_details',
-		'to_table': 'Purchase Receipt Detail',
-		'validation_logic': 'docstatus=1 and qty > ifnull(received_qty,0)'
-	},
-	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Table Mapper Detail',
-		'from_field': None,
-		'from_table': 'Purchase Order',
-		'idx': 2,
-		'match_id': 0,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000026',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': 'prevdoc_docname',
-		'to_field': None,
-		'to_table': 'Purchase Receipt',
-		'validation_logic': 'docstatus = 1'
-	},
-	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Table Mapper Detail',
-		'from_field': 'purchase_tax_details',
-		'from_table': 'Purchase Tax Detail',
-		'idx': 3,
-		'match_id': 2,
-		'modified': '2011-04-06 13:47:31',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000027',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
-		'to_field': 'purchase_tax_details',
-		'to_table': 'Purchase Tax Detail',
-		'validation_logic': 'docstatus = 1'
-	}
-]
\ No newline at end of file
diff --git a/srm/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt b/srm/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt
deleted file mode 100644
index 116b4e9c50..0000000000
--- a/srm/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt	
+++ /dev/null
@@ -1 +0,0 @@
-[{'modified_by': 'ashwini@webnotestech.com', 'name': 'Purchase Receipt-Payable Voucher', 'parent': None, 'to_doctype': 'Payable Voucher', 'creation': '2009-03-12 12:10:22', 'modified': '2010-11-02 09:46:20', 'module': 'SRM', 'doctype': 'DocType Mapper', 'idx': None, 'parenttype': None, 'ref_doc_submitted': 1, 'owner': 'Administrator', 'docstatus': 0, 'from_doctype': 'Purchase Receipt', 'parentfield': None}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00111', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'company', 'creation': '2009-03-12 12:10:22', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'company', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00112', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'fiscal_year', 'creation': '2009-03-12 12:10:22', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 2, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'fiscal_year', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00113', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'supplier', 'creation': '2009-03-12 12:10:22', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 3, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'supplier', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00900', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'supplier_name', 'creation': '2010-08-26 16:36:43', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 4, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'supplier_name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00349', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'currency', 'creation': '2009-06-25 20:20:25', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 5, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'currency', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00114', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'conversion_rate', 'creation': '2009-03-12 12:10:22', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 6, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'conversion_rate', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00115', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'item_code', 'creation': '2009-03-12 12:10:22', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 7, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'item_code', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00246', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'item_name', 'creation': '2009-03-25 17:37:43', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 8, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'item_name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00245', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'brand', 'creation': '2009-03-25 17:37:43', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 9, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'brand', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00116', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'description', 'creation': '2009-03-12 12:10:22', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 10, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'description', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00117', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'qty', 'creation': '2009-03-12 12:10:22', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 11, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'eval: flt(obj.qty) - flt(obj.billed_qty)', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00118', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'rate', 'creation': '2009-03-12 12:10:22', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 12, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'purchase_rate', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00596', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'amount', 'creation': '2009-10-27 10:40:33', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 13, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.purchase_rate)', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00346', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'import_rate', 'creation': '2009-06-25 12:29:15', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 14, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'import_rate', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00707', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'import_amount', 'creation': '2010-05-24 12:24:15', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 15, 'parenttype': 'DocType Mapper', 'checking_operator': '', 'check_reference_value': None, 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.import_rate)', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00119', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'purchase_receipt', 'creation': '2009-03-12 12:10:22', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 16, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'parent', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00120', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'purchase_order', 'creation': '2009-03-12 12:10:22', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 17, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'prevdoc_docname', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00234', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'pr_detail', 'creation': '2009-03-18 06:29:21', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 18, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00235', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'po_detail', 'creation': '2009-03-18 06:30:13', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 19, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'prevdoc_detail_docname', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00652', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'item_group', 'creation': '2009-12-22 16:55:31', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 20, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'from_field': 'item_group', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00659', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'category', 'creation': '2010-02-05 16:42:00', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 21, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'nabin@webnotestech.com', 'docstatus': 0, 'from_field': 'category', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00669', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'add_deduct_tax', 'creation': '2010-02-05 17:05:50', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 22, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'from_field': 'add_deduct_tax', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00670', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'charge_type', 'creation': '2010-02-05 17:05:50', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 23, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'from_field': 'charge_type', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00671', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'row_id', 'creation': '2010-02-05 17:05:50', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 24, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'from_field': 'row_id', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00672', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'item_wise_tax_detail', 'creation': '2010-02-05 17:05:50', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 25, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'from_field': 'item_wise_tax_detail', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00673', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'description', 'creation': '2010-02-05 17:05:50', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 26, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'from_field': 'description', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00674', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'account_head', 'creation': '2010-02-05 17:05:50', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 27, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'from_field': 'account_head', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00675', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'cost_center', 'creation': '2010-02-05 17:05:50', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 28, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'from_field': 'cost_center', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00676', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'rate', 'creation': '2010-02-05 17:05:50', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 29, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'from_field': 'rate', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00874', 'parent': 'Purchase Receipt-Payable Voucher', 'to_field': 'project_name', 'creation': '2010-08-18 15:29:50', 'modified': '2010-11-02 09:46:20', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 30, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'project_name', 'parentfield': 'field_mapper_details'}, {'reference_key': '', 'modified_by': 'ashwini@webnotestech.com', 'name': 'TMD/0000011', 'parent': 'Purchase Receipt-Payable Voucher', 'is_reference_table': None, 'to_field': 'entries', 'creation': '2009-03-12 12:10:22', 'reference_doctype_key': '', 'modified': '2010-11-02 09:46:20', 'doctype': 'Table Mapper Detail', 'match_id': 1, 'idx': 1, 'parenttype': 'DocType Mapper', 'from_table': 'Purchase Receipt Detail', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'PV Detail', 'from_field': 'purchase_receipt_details', 'validation_logic': 'ifnull(billed_qty,0)  < qty', 'parentfield': 'table_mapper_details'}, {'reference_key': '', 'modified_by': 'ashwini@webnotestech.com', 'name': 'TMD/0000012', 'parent': 'Purchase Receipt-Payable Voucher', 'is_reference_table': None, 'to_field': None, 'creation': '2009-03-12 12:10:22', 'reference_doctype_key': '', 'modified': '2010-11-02 09:46:20', 'doctype': 'Table Mapper Detail', 'match_id': 0, 'idx': 2, 'parenttype': 'DocType Mapper', 'from_table': 'Purchase Receipt', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'Payable Voucher', 'from_field': None, 'validation_logic': 'docstatus=1', 'parentfield': 'table_mapper_details'}, {'reference_key': '', 'modified_by': 'ashwini@webnotestech.com', 'name': 'TMD/0000063', 'parent': 'Purchase Receipt-Payable Voucher', 'is_reference_table': None, 'to_field': 'purchase_tax_details', 'creation': '2010-02-05 16:42:01', 'reference_doctype_key': '', 'modified': '2010-11-02 09:46:20', 'doctype': 'Table Mapper Detail', 'match_id': 2, 'idx': 3, 'parenttype': 'DocType Mapper', 'from_table': 'Purchase Tax Detail', 'owner': 'nabin@webnotestech.com', 'docstatus': 0, 'to_table': 'Purchase Tax Detail', 'from_field': 'purchase_tax_details', 'validation_logic': 'docstatus=1', 'parentfield': 'table_mapper_details'}]
\ No newline at end of file
diff --git a/srm/__init__.py b/srm/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/doctype/__init__.py b/srm/doctype/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/doctype/indent/__init__.py b/srm/doctype/indent/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/doctype/indent/indent.txt b/srm/doctype/indent/indent.txt
deleted file mode 100644
index cd31d39672..0000000000
--- a/srm/doctype/indent/indent.txt
+++ /dev/null
@@ -1,1251 +0,0 @@
-[
-	{
-		'_last_update': '1304500997',
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': 0,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:04',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-04 14:53:17',
-		'modified_by': 'Guest',
-		'module': 'SRM',
-		'name': 'Indent',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': 1,
-		'search_fields': 'status,transaction_date,sales_order_no',
-		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': '%(per_ordered)s% ordered',
-		'tag_fields': '',
-		'use_template': None,
-		'version': 186
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:04',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2010-08-08 17:09:04',
-		'modified_by': 'Administrator',
-		'name': 'PERM00254',
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Purchase Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:04',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2010-08-08 17:09:04',
-		'modified_by': 'Administrator',
-		'name': 'PERM00255',
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Purchase Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:04',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2010-08-08 17:09:04',
-		'modified_by': 'Administrator',
-		'name': 'PERM00256',
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Material Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:04',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2010-08-08 17:09:04',
-		'modified_by': 'Administrator',
-		'name': 'PERM00257',
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Material Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:04',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2010-08-08 17:09:04',
-		'modified_by': 'Administrator',
-		'name': 'PERM00258',
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Material User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:04',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2010-08-08 17:09:04',
-		'modified_by': 'Administrator',
-		'name': 'PERM00259',
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Material User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:04',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 7,
-		'match': '',
-		'modified': '2010-08-08 17:09:04',
-		'modified_by': 'Administrator',
-		'name': 'PERM00260',
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Purchase User',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:04',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 8,
-		'match': None,
-		'modified': '2010-08-08 17:09:04',
-		'modified_by': 'Administrator',
-		'name': 'PERM00261',
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Purchase User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-09 16:45:35',
-		'default': 'Enter items and their details which are falling short in your warehouse and for which you want your purchase department to raise a purchase order.',
-		'depends_on': None,
-		'description': 'Enter items and their details for which you want your purchase department to raise a purchase order.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Basic Info',
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': '000000714',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 16:45:35',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': '000000715',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:04',
-		'default': 'IDT',
-		'depends_on': None,
-		'description': 'To manage multiple series please go to Setup > Manage Series',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'naming_series',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Series',
-		'modified': '2011-05-09 16:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL01476',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'naming_series',
-		'oldfieldtype': 'Select',
-		'options': 'IDT',
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Status',
-		'modified': '2011-05-09 16:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL01477',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Select',
-		'options': '\nDraft\nSubmitted\nStopped\nCancelled',
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 16:45:35',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': '000000716',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': 'The date at which current entry is made in system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'transaction_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': 1,
-		'label': 'Indent Date',
-		'modified': '2011-05-09 16:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL01479',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'transaction_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': '% of materials ordered against this Indent',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'per_ordered',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': '% Ordered',
-		'modified': '2011-05-09 16:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL01480',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'per_ordered',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-09 16:45:35',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Items',
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': '000000717',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': 'One or multiple Sales Order no which generated this Indent',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'sales_order_no',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Sales Order No',
-		'modified': '2011-05-09 16:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL01487',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'sales_order_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 16:45:34',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Pull Sales Order Details',
-		'modified': '2011-05-09 16:45:34',
-		'modified_by': 'Guest',
-		'name': '000000711',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'pull_so_details',
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'indent_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Indent Details',
-		'modified': '2011-05-09 16:45:34',
-		'modified_by': 'Guest',
-		'name': 'FL01482',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'indent_details',
-		'oldfieldtype': 'Table',
-		'options': 'Indent Detail',
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-09 16:45:35',
-		'default': 'Give additional details about the indent.',
-		'depends_on': None,
-		'description': 'Filing in Additional Information about the Indent will help you analyze your data better.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'More Info',
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': '000000718',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': 'Select the relevant company name if you have multiple companies',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': 'FL01484',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': 'FL01485',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': 'Name of the entity who has requested for the indent',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'requested_by',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Requested By',
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': 'FL01486',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'requested_by',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 16:45:35',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': '000000719',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'remark',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Remarks',
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': 'FL01489',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'remark',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': 'After cancelling the indent, a dialog box will ask you reason for cancellation which will be reflected in this field',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'cancel_reason',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Cancel Reason',
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': 'FL01490',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'cancel_reason',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Amended From',
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': 'FL01491',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': 'The date at which current entry is corrected in the system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'Amendment Date',
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': 'FL01492',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 16:45:35',
-		'default': None,
-		'depends_on': None,
-		'description': 'Add Terms and Conditions for the Indent. You can also prepare a master Term Sheet and use the Template',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
-		'label': 'Terms',
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': '000000720',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-12-14 10:32:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'letter_head',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
-		'label': 'Letter Head',
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': 'FL04148',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'letter_head',
-		'oldfieldtype': 'Select',
-		'options': 'link:Letter Head',
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'tc_name',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': None,
-		'label': 'Select Terms',
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': 'FL01494',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'tc_name',
-		'oldfieldtype': 'Link',
-		'options': 'Term',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 24,
-		'in_filter': None,
-		'label': 'Get Terms',
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': 'FL01495',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'get_tc_details',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 16:45:35',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 25,
-		'in_filter': None,
-		'label': 'Terms HTML',
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': '000000721',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': 'You can add Terms and Notes that will be printed in the Transaction',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'terms',
-		'fieldtype': 'Text Editor',
-		'hidden': None,
-		'icon': None,
-		'idx': 26,
-		'in_filter': None,
-		'label': 'Terms1',
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': 'FL01497',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'terms',
-		'oldfieldtype': 'Text Editor',
-		'options': None,
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 16:45:35',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 27,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': '000000722',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 28,
-		'in_filter': None,
-		'label': 'Repair Indent',
-		'modified': '2011-05-09 16:45:35',
-		'modified_by': 'Guest',
-		'name': 'FL01505',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'repair_indent',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Indent',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/srm/doctype/indent_detail/__init__.py b/srm/doctype/indent_detail/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/doctype/indent_detail/indent_detail.txt b/srm/doctype/indent_detail/indent_detail.txt
deleted file mode 100644
index fd051b30d4..0000000000
--- a/srm/doctype/indent_detail/indent_detail.txt
+++ /dev/null
@@ -1,582 +0,0 @@
-[
-	{
-		'_last_update': None,
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'IDTD/.#####',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:04',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': 1,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-04 14:41:43',
-		'modified_by': 'Guest',
-		'module': 'SRM',
-		'name': 'Indent Detail',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Tray',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 29
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'schedule_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Required Date',
-		'modified': '2011-05-09 14:48:29',
-		'modified_by': 'Administrator',
-		'name': 'FL01506',
-		'no_copy': 1,
-		'oldfieldname': 'schedule_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_code',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': 1,
-		'label': 'Item Code',
-		'modified': '2011-05-09 14:48:29',
-		'modified_by': 'Administrator',
-		'name': 'FL01507',
-		'no_copy': None,
-		'oldfieldname': 'item_code',
-		'oldfieldtype': 'Link',
-		'options': 'Item',
-		'owner': 'Administrator',
-		'parent': 'Indent Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': 1,
-		'label': 'Item Name',
-		'modified': '2011-05-09 14:48:29',
-		'modified_by': 'Administrator',
-		'name': 'FL01508',
-		'no_copy': None,
-		'oldfieldname': 'item_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Description',
-		'modified': '2011-05-09 14:48:29',
-		'modified_by': 'Administrator',
-		'name': 'FL01509',
-		'no_copy': None,
-		'oldfieldname': 'description',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': '300px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'warehouse',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Warehouse',
-		'modified': '2011-05-09 14:48:29',
-		'modified_by': 'Administrator',
-		'name': 'FL01511',
-		'no_copy': None,
-		'oldfieldname': 'warehouse',
-		'oldfieldtype': 'Link',
-		'options': 'Warehouse',
-		'owner': 'Administrator',
-		'parent': 'Indent Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'brand',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Brand',
-		'modified': '2011-05-09 14:48:29',
-		'modified_by': 'Administrator',
-		'name': 'FL01512',
-		'no_copy': None,
-		'oldfieldname': 'brand',
-		'oldfieldtype': 'Link',
-		'options': 'Brand',
-		'owner': 'Administrator',
-		'parent': 'Indent Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '100px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_group',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': 1,
-		'label': 'Item Group',
-		'modified': '2011-05-09 14:48:29',
-		'modified_by': 'Administrator',
-		'name': 'FL01513',
-		'no_copy': 0,
-		'oldfieldname': 'item_group',
-		'oldfieldtype': 'Link',
-		'options': 'Item Group',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Indent Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:04',
-		'default': '0.00',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'qty',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Quantity',
-		'modified': '2011-05-09 14:48:29',
-		'modified_by': 'Administrator',
-		'name': 'FL01510',
-		'no_copy': 0,
-		'oldfieldname': 'qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': '50px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'lead_time_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Lead Time Date',
-		'modified': '2011-05-09 14:48:29',
-		'modified_by': 'Administrator',
-		'name': 'FL01514',
-		'no_copy': 1,
-		'oldfieldname': 'lead_time_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'uom',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Stock UOM',
-		'modified': '2011-05-09 14:48:29',
-		'modified_by': 'Administrator',
-		'name': 'FL01515',
-		'no_copy': 0,
-		'oldfieldname': 'uom',
-		'oldfieldtype': 'Link',
-		'options': 'UOM',
-		'owner': 'Administrator',
-		'parent': 'Indent Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': '50px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'min_order_qty',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Min Order Qty',
-		'modified': '2011-05-09 14:48:29',
-		'modified_by': 'Administrator',
-		'name': 'FL01516',
-		'no_copy': 1,
-		'oldfieldname': 'min_order_qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': None,
-		'trigger': None,
-		'width': '70px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'projected_qty',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Projected Qty',
-		'modified': '2011-05-09 14:48:29',
-		'modified_by': 'Administrator',
-		'name': 'FL01518',
-		'no_copy': 1,
-		'oldfieldname': 'projected_qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Indent Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '70px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'ordered_qty',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Ordered Qty',
-		'modified': '2011-05-09 14:48:29',
-		'modified_by': 'Administrator',
-		'name': 'FL01517',
-		'no_copy': 1,
-		'oldfieldname': 'ordered_qty',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Indent Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 14:48:29',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'sales_order_no',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Sales Order No',
-		'modified': '2011-05-09 14:48:29',
-		'modified_by': 'Administrator',
-		'name': '000000494',
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-08-08 17:09:04',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'page_break',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Page Break',
-		'modified': '2011-05-09 14:48:29',
-		'modified_by': 'Administrator',
-		'name': 'FL01519',
-		'no_copy': 1,
-		'oldfieldname': 'page_break',
-		'oldfieldtype': 'Check',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Indent Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/srm/doctype/landed_cost_detail/__init__.py b/srm/doctype/landed_cost_detail/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/doctype/landed_cost_detail/landed_cost_detail.txt b/srm/doctype/landed_cost_detail/landed_cost_detail.txt
deleted file mode 100644
index c6816a15a4..0000000000
--- a/srm/doctype/landed_cost_detail/landed_cost_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-02-12 11:47:07', 'search_fields': None, 'module': 'SRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'wasim@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 1, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'wasim@webnotestech.com', 'document_type': None, 'name': 'Landed Cost Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-02-12 11:47:07', 'doctype': 'DocField', 'oldfieldname': 'account_head', 'owner': 'wasim@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'wasim@webnotestech.com', 'label': 'Account Head', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Landed Cost Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03969', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-02-12 11:47:07', 'parenttype': 'DocType', 'fieldname': 'account_head', 'fieldtype': 'Link', 'options': 'Account', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-02-12 11:47:07', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'wasim@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'wasim@webnotestech.com', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Landed Cost Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03970', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-02-12 11:47:07', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-02-12 11:47:07', 'doctype': 'DocField', 'oldfieldname': 'amount', 'owner': 'wasim@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'wasim@webnotestech.com', 'label': 'Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Landed Cost Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03971', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-02-12 11:47:07', 'parenttype': 'DocType', 'fieldname': 'amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/srm/doctype/lc_pr_detail/__init__.py b/srm/doctype/lc_pr_detail/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/doctype/lc_pr_detail/lc_pr_detail.txt b/srm/doctype/lc_pr_detail/lc_pr_detail.txt
deleted file mode 100644
index a21be955d6..0000000000
--- a/srm/doctype/lc_pr_detail/lc_pr_detail.txt
+++ /dev/null
@@ -1,196 +0,0 @@
-[
-	{
-		'_last_update': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:07',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': 1,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-04-27 10:06:12',
-		'modified_by': 'Administrator',
-		'module': 'SRM',
-		'name': 'LC PR Detail',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 2
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'purchase_receipt_no',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Purchase Receipt No',
-		'modified': '2011-04-27 10:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01758',
-		'no_copy': None,
-		'oldfieldname': 'purchase_receipt_no',
-		'oldfieldtype': 'Link',
-		'options': 'Purchase Receipt',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'LC PR Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:07',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'include_in_landed_cost',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Include In Landed Cost',
-		'modified': '2011-04-27 10:06:12',
-		'modified_by': 'Administrator',
-		'name': 'FL01759',
-		'no_copy': None,
-		'oldfieldname': 'include_in_landed_cost',
-		'oldfieldtype': 'Check',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'LC PR Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '150px'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-27 10:06:12',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'net_total',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Net Total',
-		'modified': '2011-04-27 10:06:12',
-		'modified_by': 'Administrator',
-		'name': '000000650',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'LC PR Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-27 10:06:12',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'added_cost',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Added Cost',
-		'modified': '2011-04-27 10:06:12',
-		'modified_by': 'Administrator',
-		'name': '000000651',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'LC PR Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/srm/doctype/po_detail/__init__.py b/srm/doctype/po_detail/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/doctype/po_detail/po_detail.txt b/srm/doctype/po_detail/po_detail.txt
deleted file mode 100644
index a4cb6d8825..0000000000
--- a/srm/doctype/po_detail/po_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-03-12 12:10:18', 'search_fields': None, 'module': 'SRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 48, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': 'POD/.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': '', 'name': 'PO Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-11-12 16:53:30', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': 1, 'oldfieldtype': 'Date', 'creation': '2009-03-12 12:10:18', 'doctype': 'DocField', 'oldfieldname': 'schedule_date', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Reqd By Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 0, 'description': None, 'parent': 'PO Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01169', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'schedule_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:10:18', 'doctype': 'DocField', 'oldfieldname': 'item_code', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': 0, 'modified_by': 'harshada@webnotestech.com', 'label': 'Item Code', 'width': '', 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PO Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01170', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'item_code', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-25 17:25:15', 'doctype': 'DocField', 'oldfieldname': 'item_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Item Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 0, 'description': None, 'parent': 'PO Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01469', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'item_name', 'fieldtype': 'Data', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2009-03-12 12:10:18', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Description', 'width': '160px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01171', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:10:18', 'doctype': 'DocField', 'oldfieldname': 'qty', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Quantity', 'width': '60px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01172', 'idx': 5, 'default': '0.00', 'colour': None, 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:10:18', 'doctype': 'DocField', 'oldfieldname': 'uom', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': 0, 'modified_by': 'harshada@webnotestech.com', 'label': 'UOM', 'width': '100px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01173', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'uom', 'fieldtype': 'Link', 'options': 'UOM', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:10:18', 'doctype': 'DocField', 'oldfieldname': 'purchase_rate', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Rate (Default Curr.)', 'width': '100px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01176', 'idx': 7, 'default': '0.00', 'colour': None, 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'purchase_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:10:18', 'doctype': 'DocField', 'oldfieldname': 'amount', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Amount  (Default Curr.)', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01177', 'idx': 8, 'default': '0.00', 'colour': None, 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'amount', 'fieldtype': 'Currency', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:10:18', 'doctype': 'DocField', 'oldfieldname': 'import_rate', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 0, 'modified_by': 'harshada@webnotestech.com', 'label': 'Rate', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 0, 'description': None, 'parent': 'PO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01181', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'import_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-05-24 11:32:21', 'doctype': 'DocField', 'oldfieldname': 'import_amount', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05034', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'import_amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:10:18', 'doctype': 'DocField', 'oldfieldname': 'warehouse', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Warehouse', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 0, 'description': None, 'parent': 'PO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01178', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'warehouse', 'fieldtype': 'Link', 'options': 'Warehouse', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:10:18', 'doctype': 'DocField', 'oldfieldname': 'conversion_factor', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Conversion Factor', 'width': '', 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 1, 'description': None, 'parent': 'PO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01174', 'idx': 12, 'default': '', 'colour': 'White:FFF', 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'conversion_factor', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:10:18', 'doctype': 'DocField', 'oldfieldname': 'stock_uom', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Stock UOM', 'width': '', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 1, 'description': None, 'parent': 'PO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01175', 'idx': 13, 'default': None, 'colour': None, 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'stock_uom', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 0, 'oldfieldtype': 'Data', 'creation': '2009-09-17 21:26:32', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_doctype', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Prevdoc DocType', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'PO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03042', 'idx': 14, 'default': None, 'colour': 'White:FFF', 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'prevdoc_doctype', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 0, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:10:18', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_docname', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Indent No', 'width': '120px', 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 1, 'description': None, 'parent': 'PO Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01168', 'idx': 15, 'default': None, 'colour': 'White:FFF', 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'prevdoc_docname', 'fieldtype': 'Link', 'options': 'Indent', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2010-06-21 17:40:03', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_date', 'owner': 'nabin@webnotestech.com', 'reqd': None, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Indent Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 1, 'description': None, 'parent': 'PO Detail', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL05392', 'idx': 16, 'default': None, 'colour': None, 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'prevdoc_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 0, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:10:18', 'doctype': 'DocField', 'oldfieldname': 'prevdoc_detail_docname', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Indent Detail No', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'PO Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL01180', 'idx': 17, 'default': None, 'colour': 'White:FFF', 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'prevdoc_detail_docname', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-25 17:25:15', 'doctype': 'DocField', 'oldfieldname': 'brand', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Brand', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 1, 'description': None, 'parent': 'PO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01468', 'idx': 18, 'default': None, 'colour': None, 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'brand', 'fieldtype': 'Link', 'options': 'Brand', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-12-17 12:05:52', 'doctype': 'DocField', 'oldfieldname': 'item_group', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': 1, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Item Group', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 1, 'description': None, 'parent': 'PO Detail', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL03521', 'idx': 19, 'default': None, 'colour': None, 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'item_group', 'fieldtype': 'Link', 'options': 'Item Group', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Currency', 'creation': '2009-03-28 14:31:38', 'doctype': 'DocField', 'oldfieldname': 'stock_qty', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Stock Qty', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 1, 'description': None, 'parent': 'PO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01543', 'idx': 20, 'default': None, 'colour': None, 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'stock_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Currency', 'creation': '2009-11-17 17:39:37', 'doctype': 'DocField', 'oldfieldname': 'received_qty', 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Received Qty', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 1, 'description': None, 'parent': 'PO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03362', 'idx': 21, 'default': None, 'colour': None, 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'received_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Currency', 'creation': '2009-03-12 12:10:18', 'doctype': 'DocField', 'oldfieldname': 'billed_qty', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Billed Quantity', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 1, 'description': None, 'parent': 'PO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01182', 'idx': 22, 'default': '0.00', 'colour': None, 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'billed_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-01-29 12:11:33', 'doctype': 'DocField', 'oldfieldname': 'item_tax_rate', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Item Tax Rate', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': 'Tax detail table fetched from item master as a string and stored in this field.\nUsed for Purchase Other Charges', 'parent': 'PO Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03893', 'idx': 23, 'default': None, 'colour': 'White:FFF', 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'item_tax_rate', 'fieldtype': 'Small Text', 'options': None, 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Check', 'creation': '2009-09-03 15:05:31', 'doctype': 'DocField', 'oldfieldname': 'page_break', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Page Break', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 0, 'description': None, 'parent': 'PO Detail', 'search_index': None, 'allow_on_submit': 1, 'icon': None, 'name': 'FL02914', 'idx': 24, 'default': None, 'colour': None, 'modified': '2010-11-12 16:53:30', 'parenttype': 'DocType', 'fieldname': 'page_break', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/srm/doctype/po_raw_material_detail/__init__.py b/srm/doctype/po_raw_material_detail/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/doctype/po_raw_material_detail/po_raw_material_detail.txt b/srm/doctype/po_raw_material_detail/po_raw_material_detail.txt
deleted file mode 100644
index ce9da69094..0000000000
--- a/srm/doctype/po_raw_material_detail/po_raw_material_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-01-14 10:41:08', 'search_fields': None, 'module': 'SRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'dhanalekshmi@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 1, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'dhanalekshmi@webnotestech.com', 'document_type': None, 'name': 'PO Raw Material Detail', 'idx': None, 'hide_toolbar': 1, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-01-14 10:41:08', 'doctype': 'DocField', 'oldfieldname': 'reference_name', 'owner': 'dhanalekshmi@webnotestech.com', 'reqd': None, 'in_filter': 0, 'print_hide': None, 'modified_by': 'dhanalekshmi@webnotestech.com', 'label': 'Reference Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 1, 'description': None, 'parent': 'PO Raw Material Detail', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL03574', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-01-14 10:41:08', 'parenttype': 'DocType', 'fieldname': 'reference_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-01-14 10:41:08', 'doctype': 'DocField', 'oldfieldname': 'bom_detail_no', 'owner': 'dhanalekshmi@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'dhanalekshmi@webnotestech.com', 'label': 'BOM Detail No', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PO Raw Material Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03575', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-01-14 10:41:08', 'parenttype': 'DocType', 'fieldname': 'bom_detail_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-01-14 10:41:08', 'doctype': 'DocField', 'oldfieldname': 'main_item_code', 'owner': 'dhanalekshmi@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'dhanalekshmi@webnotestech.com', 'label': 'Item Code', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PO Raw Material Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03576', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-01-14 10:41:08', 'parenttype': 'DocType', 'fieldname': 'main_item_code', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-01-14 10:41:08', 'doctype': 'DocField', 'oldfieldname': 'rm_item_code', 'owner': 'dhanalekshmi@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'dhanalekshmi@webnotestech.com', 'label': 'Raw Material Item Code', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PO Raw Material Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03577', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-01-14 10:41:08', 'parenttype': 'DocType', 'fieldname': 'rm_item_code', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-01-14 10:41:09', 'doctype': 'DocField', 'oldfieldname': 'stock_uom', 'owner': 'dhanalekshmi@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'dhanalekshmi@webnotestech.com', 'label': 'Stock Uom', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PO Raw Material Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03578', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-01-14 10:41:09', 'parenttype': 'DocType', 'fieldname': 'stock_uom', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-14 10:41:09', 'doctype': 'DocField', 'oldfieldname': 'required_qty', 'owner': 'dhanalekshmi@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'dhanalekshmi@webnotestech.com', 'label': 'Required Qty', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PO Raw Material Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03579', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-01-14 10:41:09', 'parenttype': 'DocType', 'fieldname': 'required_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-14 10:41:09', 'doctype': 'DocField', 'oldfieldname': 'conversion_factor', 'owner': 'dhanalekshmi@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'dhanalekshmi@webnotestech.com', 'label': 'Conversion Factor', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'PO Raw Material Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03580', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-01-14 10:41:09', 'parenttype': 'DocType', 'fieldname': 'conversion_factor', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-14 10:41:09', 'doctype': 'DocField', 'oldfieldname': 'rate', 'owner': 'dhanalekshmi@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'dhanalekshmi@webnotestech.com', 'label': 'Rate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PO Raw Material Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03581', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-01-14 10:41:09', 'parenttype': 'DocType', 'fieldname': 'rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-14 10:41:09', 'doctype': 'DocField', 'oldfieldname': 'amount', 'owner': 'dhanalekshmi@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'dhanalekshmi@webnotestech.com', 'label': 'Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PO Raw Material Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03582', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-01-14 10:41:09', 'parenttype': 'DocType', 'fieldname': 'amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/srm/doctype/pr_raw_material_detail/__init__.py b/srm/doctype/pr_raw_material_detail/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/doctype/pr_raw_material_detail/pr_raw_material_detail.txt b/srm/doctype/pr_raw_material_detail/pr_raw_material_detail.txt
deleted file mode 100644
index 288c61b44c..0000000000
--- a/srm/doctype/pr_raw_material_detail/pr_raw_material_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-11-23 16:39:30', 'search_fields': None, 'module': 'SRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'wasim@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 17, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'nabin@webnotestech.com', 'document_type': None, 'name': 'PR Raw Material Detail', 'idx': None, 'hide_toolbar': 0, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-23 16:39:31', 'doctype': 'DocField', 'oldfieldname': 'reference_name', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': 0, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Reference Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 1, 'description': None, 'parent': 'PR Raw Material Detail', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL03392', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-06-30 15:00:33', 'parenttype': 'DocType', 'fieldname': 'reference_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-12-01 12:22:23', 'doctype': 'DocField', 'oldfieldname': 'bom_detail_no', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'BOM Detail No', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PR Raw Material Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03459', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-06-30 15:00:33', 'parenttype': 'DocType', 'fieldname': 'bom_detail_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-23 16:39:31', 'doctype': 'DocField', 'oldfieldname': 'main_item_code', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Item Code', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PR Raw Material Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03393', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-06-30 15:00:33', 'parenttype': 'DocType', 'fieldname': 'main_item_code', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-23 16:39:31', 'doctype': 'DocField', 'oldfieldname': 'rm_item_code', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Raw Material Item Code', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PR Raw Material Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03394', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-06-30 15:00:33', 'parenttype': 'DocType', 'fieldname': 'rm_item_code', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-01-21 10:08:33', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PR Raw Material Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03650', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-06-30 15:00:33', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-30 18:02:44', 'doctype': 'DocField', 'oldfieldname': 'stock_uom', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Stock Uom', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PR Raw Material Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03454', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-06-30 15:00:33', 'parenttype': 'DocType', 'fieldname': 'stock_uom', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-11-30 14:32:11', 'doctype': 'DocField', 'oldfieldname': 'required_qty', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Required Qty', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PR Raw Material Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03449', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-06-30 15:00:33', 'parenttype': 'DocType', 'fieldname': 'required_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-11-30 14:32:11', 'doctype': 'DocField', 'oldfieldname': 'consumed_qty', 'owner': 'wasim@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Consumed Qty', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PR Raw Material Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03448', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-06-30 15:00:33', 'parenttype': 'DocType', 'fieldname': 'consumed_qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-11-30 19:19:34', 'doctype': 'DocField', 'oldfieldname': 'conversion_factor', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Conversion Factor', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'PR Raw Material Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03455', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-06-30 15:00:33', 'parenttype': 'DocType', 'fieldname': 'conversion_factor', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-11-23 16:39:31', 'doctype': 'DocField', 'oldfieldname': 'rate', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Rate', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'PR Raw Material Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03396', 'idx': 10, 'default': None, 'colour': None, 'modified': '2010-06-30 15:00:33', 'parenttype': 'DocType', 'fieldname': 'rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-11-23 16:39:31', 'doctype': 'DocField', 'oldfieldname': 'amount', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Amount', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PR Raw Material Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03397', 'idx': 11, 'default': None, 'colour': None, 'modified': '2010-06-30 15:00:33', 'parenttype': 'DocType', 'fieldname': 'amount', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2010-01-21 14:23:48', 'doctype': 'DocField', 'oldfieldname': 'current_stock', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'nabin@webnotestech.com', 'label': 'Current Stock', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'PR Raw Material Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03657', 'idx': 12, 'default': None, 'colour': None, 'modified': '2010-06-30 15:00:33', 'parenttype': 'DocType', 'fieldname': 'current_stock', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/srm/doctype/purchase_common/__init__.py b/srm/doctype/purchase_common/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/doctype/purchase_common/purchase_common.txt b/srm/doctype/purchase_common/purchase_common.txt
deleted file mode 100644
index fa89213bda..0000000000
--- a/srm/doctype/purchase_common/purchase_common.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-18 17:29:02', 'search_fields': None, 'module': 'SRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 229, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': '', 'name': 'Purchase Common', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-11-17 10:46:49', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/srm/doctype/purchase_order/__init__.py b/srm/doctype/purchase_order/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/doctype/purchase_order/purchase_order.txt b/srm/doctype/purchase_order/purchase_order.txt
deleted file mode 100644
index daa70ed4df..0000000000
--- a/srm/doctype/purchase_order/purchase_order.txt
+++ /dev/null
@@ -1,2822 +0,0 @@
-[
-	{
-		'_last_update': '1305629955',
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Transaction',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': 1,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-17 16:29:14',
-		'modified_by': 'Guest',
-		'module': 'SRM',
-		'name': 'Purchase Order',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': 1,
-		'search_fields': 'status, transaction_date, supplier,grand_total',
-		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': 'To %(supplier_name)s on %(transaction_date)s | %(per_received)s% delivered',
-		'tag_fields': None,
-		'use_template': None,
-		'version': 494
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-02-17 15:11:03',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-05-11 17:19:19',
-		'modified_by': 'ravi@iwebnotes.com',
-		'name': 'PERM00855',
-		'owner': 'umair@iwebnotes.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Production Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:15',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-05-11 17:19:19',
-		'modified_by': 'ravi@iwebnotes.com',
-		'name': 'PERM00411',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Material User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:15',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-05-11 17:19:19',
-		'modified_by': 'ravi@iwebnotes.com',
-		'name': 'PERM00412',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Material User',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:15',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2011-05-11 17:19:19',
-		'modified_by': 'ravi@iwebnotes.com',
-		'name': 'PERM00413',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Purchase Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:15',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2011-05-11 17:19:19',
-		'modified_by': 'ravi@iwebnotes.com',
-		'name': 'PERM00414',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Purchase Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 0,
-		'create': 1,
-		'creation': '2010-08-08 17:09:15',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2011-05-11 17:19:19',
-		'modified_by': 'ravi@iwebnotes.com',
-		'name': 'PERM00415',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Purchase User',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:15',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 7,
-		'match': None,
-		'modified': '2011-05-11 17:19:19',
-		'modified_by': 'ravi@iwebnotes.com',
-		'name': 'PERM00416',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'All',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:15',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 8,
-		'match': None,
-		'modified': '2011-05-11 17:19:19',
-		'modified_by': 'ravi@iwebnotes.com',
-		'name': 'PERM00417',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Supplier',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:15',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 9,
-		'match': None,
-		'modified': '2011-05-11 17:19:19',
-		'modified_by': 'ravi@iwebnotes.com',
-		'name': 'PERM00418',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 2,
-		'read': 1,
-		'role': 'All',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:44:59',
-		'default': None,
-		'depends_on': None,
-		'description': 'Enter rates and quantity of items you want to purchase and send the purchase order to your supplier.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Basic Info',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL05241',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL05242',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': 'To manage multiple series please go to Setup > Manage Series',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'naming_series',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Series',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL02372',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'naming_series',
-		'oldfieldtype': 'Select',
-		'options': '\nPO',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': 'Supplier (vendor) name as entered in supplier master',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Supplier',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL02374',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'supplier',
-		'oldfieldtype': 'Link',
-		'options': 'Supplier',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier_address',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': 1,
-		'label': 'Supplier Address',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL02375',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_person',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': 1,
-		'label': 'Contact Person',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL02376',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-09-01 15:48:08',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Name',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL03864',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'address_display',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Address',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL05231',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_display',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Contact',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL05232',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_mobile',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Mobile No',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL05233',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:58',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'contact_email',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Contact Email',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL05234',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL05243',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': 'The date at which current entry is made in system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'transaction_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': 1,
-		'label': 'Purchase Order Date',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL02380',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'transaction_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': 1,
-		'label': 'Status',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL02373',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Select',
-		'options': '\nDraft\nSubmitted\nStopped\nCancelled',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 0,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:48:08',
-		'default': None,
-		'depends_on': None,
-		'description': 'Track this Purchase Order against any Project',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'project_name',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': 1,
-		'label': 'Project Name',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL03865',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'project_name',
-		'oldfieldtype': 'Link',
-		'options': 'Project',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': '% of materials received against this Purchase Order',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'per_received',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': '% Received',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL02378',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'per_received',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': '% of materials billed against this Purchase Order.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'per_billed',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': '% Billed',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL02379',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'per_billed',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:44:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Items',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL05244',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': 'You can make a purchase order from multiple indents. Select indents one by one and click on the button below.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'indent_no',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Select Indent',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL02384',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'indent_no',
-		'oldfieldtype': 'Link',
-		'options': 'Indent',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': 0,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'Get Items',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL02385',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'get_indent_details',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-29 15:27:12',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_subcontracted',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
-		'label': 'Is Subcontracted',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': '000002136',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': '\nYes\nNo',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 22,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL05245',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': "Supplier's currency",
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'currency',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 23,
-		'in_filter': None,
-		'label': 'Currency',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL02381',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'currency',
-		'oldfieldtype': 'Select',
-		'options': 'link:Currency',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'default': '1',
-		'depends_on': None,
-		'description': "Rate at which supplier's currency is converted to your currency",
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'conversion_rate',
-		'fieldtype': 'Currency',
-		'hidden': 0,
-		'icon': None,
-		'idx': 24,
-		'in_filter': None,
-		'label': 'Conversion Rate',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL02382',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'conversion_rate',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 25,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL05246',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'po_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 26,
-		'in_filter': None,
-		'label': 'PO Details',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL02386',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'po_details',
-		'oldfieldtype': 'Table',
-		'options': 'PO Detail',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 27,
-		'in_filter': None,
-		'label': 'Get Last Purchase Rate',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL02387',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'net_total',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 28,
-		'in_filter': None,
-		'label': 'Net Total*',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL02425',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'net_total',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 29,
-		'in_filter': None,
-		'label': 'Re-Calculate Values',
-		'modified': '2011-05-25 12:44:58',
-		'modified_by': 'Guest',
-		'name': 'FL02395',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:44:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 30,
-		'in_filter': None,
-		'label': 'Note HTML',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL05247',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': '
Note : * In Base Currency\n
',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:44:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 31,
-		'in_filter': None,
-		'label': 'Taxes',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL05248',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': 'If you have created a standard template in Other Charges master, select one and click on the button below.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'purchase_other_charges',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 32,
-		'in_filter': None,
-		'label': 'Purchase Other Charges',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02397',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'purchase_other_charges',
-		'oldfieldtype': 'Link',
-		'options': 'Purchase Other Charges',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 33,
-		'in_filter': None,
-		'label': 'Get Tax Detail',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02398',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'get_purchase_tax_details',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'purchase_tax_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 34,
-		'in_filter': None,
-		'label': 'Purchase Tax Details',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02399',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'purchase_tax_details',
-		'oldfieldtype': 'Table',
-		'options': 'Purchase Tax Detail',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 35,
-		'in_filter': None,
-		'label': 'Calculate Tax',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02400',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 36,
-		'in_filter': None,
-		'label': 'Tax Calculation',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL05249',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'total_tax',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 37,
-		'in_filter': None,
-		'label': 'Total Tax*',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02402',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'total_tax',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:44:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 38,
-		'in_filter': None,
-		'label': 'Note HTML',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL05250',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': '
Note : * In Base Currency\n
',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:44:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 39,
-		'in_filter': None,
-		'label': 'Totals',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL05251',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'grand_total',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 40,
-		'in_filter': None,
-		'label': 'Grand Total',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02426',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'grand_total',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'rounded_total',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 41,
-		'in_filter': None,
-		'label': 'Rounded Total',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02390',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'rounded_total',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': 'In Words will be visible once you save the Purchase Order.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'in_words',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 42,
-		'in_filter': None,
-		'label': 'In Words',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02391',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'in_words',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'other_charges_added',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 43,
-		'in_filter': None,
-		'label': 'Other Charges Added',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02422',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'other_charges_added',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'other_charges_deducted',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 44,
-		'in_filter': None,
-		'label': 'Other Charges Deducted',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02423',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'other_charges_deducted',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 45,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL05252',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'net_total_import',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 46,
-		'in_filter': None,
-		'label': 'Net Total (Import)',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02388',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'net_total_import',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'grand_total_import',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 47,
-		'in_filter': None,
-		'label': 'Grand Total (Import)',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02389',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'grand_total_import',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': 0,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': 'In Words(Import) will be visible once you save the Purchase Order.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'in_words_import',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 48,
-		'in_filter': None,
-		'label': 'In Words(Import)',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02392',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'in_words_import',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'other_charges_added_import',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 49,
-		'in_filter': None,
-		'label': 'Other Charges Added (Import)',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02393',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'other_charges_added_import',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': 0,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'other_charges_deducted_import',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 50,
-		'in_filter': None,
-		'label': 'Other Charges Deducted (Import)',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02394',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'other_charges_deducted_import',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': 0,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 51,
-		'in_filter': None,
-		'label': 'Terms',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL05253',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-12-14 10:23:18',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'letter_head',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 52,
-		'in_filter': None,
-		'label': 'Letter Head',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL04216',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'letter_head',
-		'oldfieldtype': 'Select',
-		'options': 'link:Letter Head',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'tc_name',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 53,
-		'in_filter': None,
-		'label': 'Select Terms',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02404',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'tc_name',
-		'oldfieldtype': 'Link',
-		'options': 'Term',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 54,
-		'in_filter': None,
-		'label': 'Get Terms',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02405',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'get_tc_details',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 55,
-		'in_filter': None,
-		'label': 'Terms HTML',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL05254',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': 'You can add Terms and Notes that will be printed in the Transaction',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'terms',
-		'fieldtype': 'Text Editor',
-		'hidden': None,
-		'icon': None,
-		'idx': 56,
-		'in_filter': None,
-		'label': 'Terms1',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02407',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'terms',
-		'oldfieldtype': 'Text Editor',
-		'options': None,
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 57,
-		'in_filter': None,
-		'label': 'More Info',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL05255',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'ref_sq',
-		'fieldtype': 'Data',
-		'hidden': 1,
-		'icon': None,
-		'idx': 58,
-		'in_filter': None,
-		'label': 'Ref SQ',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02409',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'ref_sq',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'hidden': 0,
-		'icon': None,
-		'idx': 59,
-		'in_filter': None,
-		'label': 'Amended From',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02410',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': 0,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': 'The date at which current entry is corrected in the system.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'hidden': 0,
-		'icon': None,
-		'idx': 60,
-		'in_filter': None,
-		'label': 'Amendment Date',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02411',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': 'Select the relevant company name if you have multiple companies',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 61,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02412',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 62,
-		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02413',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'select_print_heading',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 63,
-		'in_filter': None,
-		'label': 'Select Print Heading',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02414',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'select_print_heading',
-		'oldfieldtype': 'Link',
-		'options': 'Print Heading',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': 1,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'instructions',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 64,
-		'in_filter': None,
-		'label': 'Instructions',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02415',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'instructions',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'sneha@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:44:59',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 65,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL05256',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'payment_terms',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 66,
-		'in_filter': None,
-		'label': 'Payment Terms',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02417',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'payment_terms',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'remarks',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 67,
-		'in_filter': None,
-		'label': 'Remarks',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02418',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'remarks',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'cancel_reason',
-		'fieldtype': 'Data',
-		'hidden': 0,
-		'icon': None,
-		'idx': 68,
-		'in_filter': None,
-		'label': 'Cancel Reason',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02419',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'cancel_reason',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:44:59',
-		'default': None,
-		'depends_on': None,
-		'description': 'Required raw materials issued to the supplier for producing a sub - contracted item.',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 69,
-		'in_filter': None,
-		'label': 'Raw Material Details',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL05257',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'dhanalekshmi@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'po_raw_material_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 70,
-		'in_filter': None,
-		'label': 'PO Raw Material Details',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02428',
-		'no_column': None,
-		'no_copy': 0,
-		'oldfieldname': 'po_raw_material_details',
-		'oldfieldtype': 'Table',
-		'options': 'PO Raw Material Detail',
-		'owner': 'dhanalekshmi@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': 1,
-		'colour': None,
-		'creation': '2010-08-08 17:09:15',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 71,
-		'in_filter': None,
-		'label': 'Repair Purchase Order',
-		'modified': '2011-05-25 12:44:59',
-		'modified_by': 'Guest',
-		'name': 'FL02438',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'repair_purchase_order',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Order',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/srm/doctype/purchase_other_charges/__init__.py b/srm/doctype/purchase_other_charges/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/doctype/purchase_other_charges/purchase_other_charges.txt b/srm/doctype/purchase_other_charges/purchase_other_charges.txt
deleted file mode 100644
index 02b5285800..0000000000
--- a/srm/doctype/purchase_other_charges/purchase_other_charges.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-01-28 16:49:17', 'search_fields': None, 'module': 'SRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'wasim@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 22, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': 'field:title', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': 'Master', 'name': 'Purchase Other Charges', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 17:30:25', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00655', 'parent': 'Purchase Other Charges', 'read': 1, 'create': None, 'creation': '2010-01-28 16:49:17', 'modified': '2010-09-20 17:30:25', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 1, 'parenttype': 'DocType', 'role': 'All', 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': 0, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00656', 'parent': 'Purchase Other Charges', 'read': 1, 'create': 0, 'creation': '2010-01-28 16:49:17', 'modified': '2010-09-20 17:30:25', 'submit': 0, 'doctype': 'DocPerm', 'write': 0, 'idx': 2, 'parenttype': 'DocType', 'role': 'Purchase Manager', 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': '', 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00657', 'parent': 'Purchase Other Charges', 'read': 1, 'create': 1, 'creation': '2010-01-28 16:49:17', 'modified': '2010-09-20 17:30:25', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'wasim@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00987', 'parent': 'Purchase Other Charges', 'read': 1, 'create': 1, 'creation': '2010-04-30 09:46:00', 'modified': '2010-09-20 17:30:25', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 4, 'parenttype': 'DocType', 'role': 'Purchase Master Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-01-28 16:49:17', 'doctype': 'DocField', 'oldfieldname': 'title', 'owner': 'wasim@webnotestech.com', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Title', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Other Charges', 'search_index': 0, 'allow_on_submit': None, 'icon': None, 'name': 'FL03891', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 17:30:25', 'parenttype': 'DocType', 'fieldname': 'title', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Table', 'creation': '2010-01-28 16:49:17', 'doctype': 'DocField', 'oldfieldname': 'purchase_tax_details', 'owner': 'wasim@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Purchase Tax Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Purchase Other Charges', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03892', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 17:30:25', 'parenttype': 'DocType', 'fieldname': 'purchase_tax_details', 'fieldtype': 'Table', 'options': 'Purchase Tax Detail', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/srm/doctype/qa_inspection_report/__init__.py b/srm/doctype/qa_inspection_report/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/doctype/qa_inspection_report/qa_inspection_report.txt b/srm/doctype/qa_inspection_report/qa_inspection_report.txt
deleted file mode 100644
index 2d01a9ec30..0000000000
--- a/srm/doctype/qa_inspection_report/qa_inspection_report.txt
+++ /dev/null
@@ -1,837 +0,0 @@
-[
-	{
-		'_last_update': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': 'QAI/.######',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-04-08 10:53:33',
-		'modified_by': 'Administrator',
-		'module': 'SRM',
-		'name': 'QA Inspection Report',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': 'Yes',
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'item_code, report_date, purchase_receipt_no, delivery_note_no',
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 37
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:17',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2010-08-08 17:09:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00431',
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Quality Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:17',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2010-08-08 17:09:17',
-		'modified_by': 'Administrator',
-		'name': 'PERM00432',
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Quality Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:04:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'QA Inspection',
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': '000000407',
-		'no_copy': 0,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:04:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': '000000408',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:04:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'naming_series',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Naming Series',
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': '000000405',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': '\nQAI/11-12/',
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'inspection_type',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': 1,
-		'label': 'Inspection Type',
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': 'FL02590',
-		'no_copy': None,
-		'oldfieldname': 'inspection_type',
-		'oldfieldtype': 'Select',
-		'options': '\nIncoming\nOutgoing\nIn Process',
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'report_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': 1,
-		'label': 'Report Date',
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': 'FL02591',
-		'no_copy': None,
-		'oldfieldname': 'report_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_code',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 6,
-		'in_filter': 1,
-		'label': 'Item Code',
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': 'FL02592',
-		'no_copy': None,
-		'oldfieldname': 'item_code',
-		'oldfieldtype': 'Link',
-		'options': 'Item',
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'sample_size',
-		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': 0,
-		'label': 'Sample Size',
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': 'FL02593',
-		'no_copy': None,
-		'oldfieldname': 'sample_size',
-		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'jitesh',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': 1,
-		'label': 'Description',
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': 'FL02594',
-		'no_copy': None,
-		'oldfieldname': 'description',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:04:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': '000000409',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'item_serial_no',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Item Serial No',
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': 'FL02596',
-		'no_copy': None,
-		'oldfieldname': 'item_serial_no',
-		'oldfieldtype': 'Link',
-		'options': 'Serial No',
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'batch_no',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Batch No',
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': 'FL02597',
-		'no_copy': None,
-		'oldfieldname': 'batch_no',
-		'oldfieldtype': 'Link',
-		'options': 'Batch',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'purchase_receipt_no',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 12,
-		'in_filter': 1,
-		'label': 'Purchase Receipt No',
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': 'FL02598',
-		'no_copy': None,
-		'oldfieldname': 'purchase_receipt_no',
-		'oldfieldtype': 'Link',
-		'options': 'Purchase Receipt',
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'delivery_note_no',
-		'fieldtype': 'Link',
-		'hidden': 0,
-		'icon': None,
-		'idx': 13,
-		'in_filter': 1,
-		'label': 'Delivery Note No',
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': 'FL02599',
-		'no_copy': None,
-		'oldfieldname': 'delivery_note_no',
-		'oldfieldtype': 'Link',
-		'options': 'Delivery Note',
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'inspected_by',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Inspected By',
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': 'FL02600',
-		'no_copy': None,
-		'oldfieldname': 'inspected_by',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'remarks',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Remarks',
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': 'FL02601',
-		'no_copy': 1,
-		'oldfieldname': 'remarks',
-		'oldfieldtype': 'Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'verified_by',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': 'Verified By',
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': 'FL02602',
-		'no_copy': None,
-		'oldfieldname': 'verified_by',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Amended From',
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': 'FL02603',
-		'no_copy': None,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Amendment Date',
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': 'FL02604',
-		'no_copy': None,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': 1,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-09 11:04:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Specification Details',
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': '000000410',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'Get Specification Details',
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': 'FL02606',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Button',
-		'options': 'get_item_specification_details',
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:17',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'qa_specification_details',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
-		'label': 'QA Specification Details',
-		'modified': '2011-05-09 11:04:25',
-		'modified_by': 'Administrator',
-		'name': 'FL02607',
-		'no_copy': None,
-		'oldfieldname': 'qa_specification_details',
-		'oldfieldtype': 'Table',
-		'options': 'QA Specification Detail',
-		'owner': 'Administrator',
-		'parent': 'QA Inspection Report',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/srm/doctype/qa_specification_detail/__init__.py b/srm/doctype/qa_specification_detail/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/doctype/qa_specification_detail/qa_specification_detail.txt b/srm/doctype/qa_specification_detail/qa_specification_detail.txt
deleted file mode 100644
index 6cd42015aa..0000000000
--- a/srm/doctype/qa_specification_detail/qa_specification_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-03-28 12:39:12', 'search_fields': None, 'module': 'SRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 2, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'QASD/.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'QA Specification Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-28 12:39:12', 'doctype': 'DocField', 'oldfieldname': 'specification', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Parameter', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'QA Specification Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01523', 'idx': 1, 'default': None, 'colour': None, 'modified': '2009-06-01 18:12:10', 'parenttype': 'DocType', 'fieldname': 'specification', 'fieldtype': 'Data', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-28 12:39:12', 'doctype': 'DocField', 'oldfieldname': 'value', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Acceptance Criteria', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'QA Specification Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01524', 'idx': 2, 'default': None, 'colour': None, 'modified': '2009-06-01 18:12:10', 'parenttype': 'DocType', 'fieldname': 'value', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-28 12:39:12', 'doctype': 'DocField', 'oldfieldname': 'reading_1', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Reading 1', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'QA Specification Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01525', 'idx': 3, 'default': None, 'colour': None, 'modified': '2009-06-01 18:12:10', 'parenttype': 'DocType', 'fieldname': 'reading_1', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-28 12:39:12', 'doctype': 'DocField', 'oldfieldname': 'reading_2', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Reading 2', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'QA Specification Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01526', 'idx': 4, 'default': None, 'colour': None, 'modified': '2009-06-01 18:12:10', 'parenttype': 'DocType', 'fieldname': 'reading_2', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-28 12:39:12', 'doctype': 'DocField', 'oldfieldname': 'reading_3', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Reading 3', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'QA Specification Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01527', 'idx': 5, 'default': None, 'colour': None, 'modified': '2009-06-01 18:12:10', 'parenttype': 'DocType', 'fieldname': 'reading_3', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-28 12:39:12', 'doctype': 'DocField', 'oldfieldname': 'reading_4', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Reading 4', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'QA Specification Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01528', 'idx': 6, 'default': None, 'colour': None, 'modified': '2009-06-01 18:12:10', 'parenttype': 'DocType', 'fieldname': 'reading_4', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-28 12:39:12', 'doctype': 'DocField', 'oldfieldname': 'reading_5', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Reading 5', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'QA Specification Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01529', 'idx': 7, 'default': None, 'colour': None, 'modified': '2009-06-01 18:12:10', 'parenttype': 'DocType', 'fieldname': 'reading_5', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-28 12:39:12', 'doctype': 'DocField', 'oldfieldname': 'reading_6', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Reading 6', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'QA Specification Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01530', 'idx': 8, 'default': None, 'colour': None, 'modified': '2009-06-01 18:12:10', 'parenttype': 'DocType', 'fieldname': 'reading_6', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-28 12:39:12', 'doctype': 'DocField', 'oldfieldname': 'reading_7', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Reading 7', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'QA Specification Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01531', 'idx': 9, 'default': None, 'colour': None, 'modified': '2009-06-01 18:12:10', 'parenttype': 'DocType', 'fieldname': 'reading_7', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-28 12:39:12', 'doctype': 'DocField', 'oldfieldname': 'reading_8', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Reading 8', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'QA Specification Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01532', 'idx': 10, 'default': None, 'colour': None, 'modified': '2009-06-01 18:12:10', 'parenttype': 'DocType', 'fieldname': 'reading_8', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-28 12:39:12', 'doctype': 'DocField', 'oldfieldname': 'reading_9', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Reading 9', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'QA Specification Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01533', 'idx': 11, 'default': None, 'colour': None, 'modified': '2009-06-01 18:12:10', 'parenttype': 'DocType', 'fieldname': 'reading_9', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-28 12:39:13', 'doctype': 'DocField', 'oldfieldname': 'reading_10', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Reading 10', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'QA Specification Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01534', 'idx': 12, 'default': None, 'colour': None, 'modified': '2009-06-01 18:12:10', 'parenttype': 'DocType', 'fieldname': 'reading_10', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-03-28 12:39:13', 'doctype': 'DocField', 'oldfieldname': 'status', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Status', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'QA Specification Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01535', 'idx': 13, 'default': 'Accepted', 'colour': None, 'modified': '2009-06-01 18:12:10', 'parenttype': 'DocType', 'fieldname': 'status', 'fieldtype': 'Select', 'options': 'Accepted\nRejected', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/srm/doctype/raw_materials_supplied/__init__.py b/srm/doctype/raw_materials_supplied/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/doctype/raw_materials_supplied/raw_materials_supplied.txt b/srm/doctype/raw_materials_supplied/raw_materials_supplied.txt
deleted file mode 100644
index 3f2270ddd7..0000000000
--- a/srm/doctype/raw_materials_supplied/raw_materials_supplied.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-09-10 15:57:46', 'search_fields': None, 'module': 'SRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 8, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': 'RMS/.######', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Raw Materials Supplied', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-09-10 15:57:46', 'doctype': 'DocField', 'oldfieldname': 'po_item', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'PO Item', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Raw Materials Supplied', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02946', 'idx': 1, 'default': None, 'colour': None, 'modified': '2009-09-11 17:10:14', 'parenttype': 'DocType', 'fieldname': 'po_item', 'fieldtype': 'Select', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-09-10 15:57:46', 'doctype': 'DocField', 'oldfieldname': 'raw_material', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Raw Material', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Raw Materials Supplied', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02945', 'idx': 2, 'default': None, 'colour': None, 'modified': '2009-09-11 17:10:14', 'parenttype': 'DocType', 'fieldname': 'raw_material', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2009-09-10 15:57:46', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Raw Materials Supplied', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02948', 'idx': 3, 'default': None, 'colour': None, 'modified': '2009-09-11 17:10:14', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-09-10 15:57:46', 'doctype': 'DocField', 'oldfieldname': 'stock_uom', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Stock UOM', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Raw Materials Supplied', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02949', 'idx': 4, 'default': None, 'colour': None, 'modified': '2009-09-11 17:10:14', 'parenttype': 'DocType', 'fieldname': 'stock_uom', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-09-10 15:57:46', 'doctype': 'DocField', 'oldfieldname': 'source_warehouse', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Source Warehouse', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Raw Materials Supplied', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02947', 'idx': 5, 'default': None, 'colour': None, 'modified': '2009-09-11 17:10:14', 'parenttype': 'DocType', 'fieldname': 'source_warehouse', 'fieldtype': 'Select', 'options': 'link:Warehouse', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-09-10 15:57:46', 'doctype': 'DocField', 'oldfieldname': 'qty', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Qty', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Raw Materials Supplied', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02951', 'idx': 6, 'default': None, 'colour': None, 'modified': '2009-09-11 17:10:14', 'parenttype': 'DocType', 'fieldname': 'qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Currency', 'creation': '2009-09-10 15:57:46', 'doctype': 'DocField', 'oldfieldname': 'ma_valuation_rate', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Valuation  Rate (MA)', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Raw Materials Supplied', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02952', 'idx': 7, 'default': None, 'colour': None, 'modified': '2009-09-11 17:10:14', 'parenttype': 'DocType', 'fieldname': 'ma_valuation_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-09-11 11:27:29', 'doctype': 'DocField', 'oldfieldname': 'fifo_valuation_rate', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Valuation Rate (FIFO)', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Raw Materials Supplied', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02954', 'idx': 8, 'default': None, 'colour': None, 'modified': '2009-09-11 17:10:14', 'parenttype': 'DocType', 'fieldname': 'fifo_valuation_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/srm/doctype/supplier/__init__.py b/srm/doctype/supplier/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/doctype/supplier/supplier.txt b/srm/doctype/supplier/supplier.txt
deleted file mode 100644
index 4ec23b6419..0000000000
--- a/srm/doctype/supplier/supplier.txt
+++ /dev/null
@@ -1,907 +0,0 @@
-[
-	{
-		'_last_update': '1305029541',
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': 1,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:26',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-10 17:42:21',
-		'modified_by': 'Guest',
-		'module': 'SRM',
-		'name': 'Supplier',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': 'supplier_name,supplier_type',
-		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': ' ',
-		'tag_fields': 'supplier_type',
-		'use_template': None,
-		'version': 86
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:26',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2010-08-08 17:09:26',
-		'modified_by': 'Administrator',
-		'name': 'PERM00566',
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Purchase Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:09:26',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2010-08-08 17:09:26',
-		'modified_by': 'Administrator',
-		'name': 'PERM00567',
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Purchase Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:26',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2010-08-08 17:09:26',
-		'modified_by': 'Administrator',
-		'name': 'PERM00568',
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Purchase Master Manager',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': 0,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:09:26',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': '',
-		'modified': '2010-08-08 17:09:26',
-		'modified_by': 'Administrator',
-		'name': 'PERM00569',
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Purchase Master Manager',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:41',
-		'default': None,
-		'depends_on': None,
-		'description': 'Note: You Can Manage Multiple Address or Contacts via Addresses & Contacts',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Basic Info',
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': 'FL05471',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:26',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Supplier Name',
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': 'FL03459',
-		'no_column': None,
-		'no_copy': 1,
-		'oldfieldname': 'supplier_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:26',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier_type',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Supplier Type',
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': 'FL03460',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'supplier_type',
-		'oldfieldtype': 'Link',
-		'options': 'Supplier Type',
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:41',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': 'FL05472',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-24 14:45:43',
-		'default': 'SUPP',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'naming_series',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Series',
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': 'FL03772',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'naming_series',
-		'oldfieldtype': 'Select',
-		'options': '\nSUPP\nSUPP/10-11/',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:26',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier_status',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Supplier Status',
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': 'FL03461',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'supplier_status',
-		'oldfieldtype': 'Select',
-		'options': '\nApproved\nUnapproved',
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:41',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Address & Contacts',
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': 'FL05473',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:41',
-		'default': None,
-		'depends_on': 'eval:doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Address Desc',
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': 'FL05474',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Addresses will appear only when you save the supplier',
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:41',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Address HTML',
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': 'FL05475',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:41',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': 'FL05476',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:41',
-		'default': None,
-		'depends_on': 'eval:doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Contact Desc',
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': 'FL05477',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Contact Details will appear only when you save the supplier',
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:41',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Contact HTML',
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': 'FL05478',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:41',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'More Info',
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': 'FL05479',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:26',
-		'default': None,
-		'depends_on': None,
-		'description': 'Enter the company name under which Account Head will be created for this Supplier',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': 1,
-		'label': 'Company',
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': 'FL03475',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:26',
-		'default': None,
-		'depends_on': None,
-		'description': 'Statutory info and other general information about your Supplier',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier_details',
-		'fieldtype': 'Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Supplier Details',
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': 'FL03476',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'supplier_details',
-		'oldfieldtype': 'Code',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:45:41',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': 'FL05480',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-03-31 13:35:57',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'credit_days',
-		'fieldtype': 'Int',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Credit Days',
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': '000002192',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:26',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'website',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Website',
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': 'FL03462',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'website',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:41',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Transaction History',
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': 'FL05481',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'yogesh@webnotestech.com',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:45:41',
-		'default': None,
-		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'HTML',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'History HTML',
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': 'FL05482',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'HTML',
-		'options': None,
-		'owner': 'yogesh@webnotestech.com',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:09:26',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'trash_reason',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 21,
-		'in_filter': None,
-		'label': 'Trash Reason',
-		'modified': '2011-05-25 12:45:41',
-		'modified_by': 'Guest',
-		'name': 'FL03457',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'trash_reason',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Supplier',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/srm/doctype/supplier_quotation/__init__.py b/srm/doctype/supplier_quotation/__init__.py
deleted file mode 100755
index e69de29bb2..0000000000
diff --git a/srm/doctype/supplier_quotation/supplier_quotation.txt b/srm/doctype/supplier_quotation/supplier_quotation.txt
deleted file mode 100755
index 3f94f21e06..0000000000
--- a/srm/doctype/supplier_quotation/supplier_quotation.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-06-30 15:39:38', 'search_fields': None, 'module': 'SRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': None, 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 242, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'SQ.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Supplier Quotation', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2011-01-28 11:41:36', 'server_code_error': ' ', 'name_case': None, 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 1, 'amend': 1, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00336', 'parent': 'Supplier Quotation', 'read': 1, 'create': 1, 'creation': '2009-06-30 16:09:56', 'modified': '2011-01-28 11:41:36', 'submit': 1, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': 1, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00337', 'parent': 'Supplier Quotation', 'read': 1, 'create': 1, 'creation': '2009-06-30 16:09:56', 'modified': '2011-01-28 11:41:36', 'submit': 1, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'Supplier', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': 1, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00425', 'parent': 'Supplier Quotation', 'read': 1, 'create': 1, 'creation': '2009-09-17 15:14:42', 'modified': '2011-01-28 11:41:36', 'submit': 1, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'Purchase User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00426', 'parent': 'Supplier Quotation', 'read': 1, 'create': None, 'creation': '2009-09-17 15:14:42', 'modified': '2011-01-28 11:41:36', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 4, 'parenttype': 'DocType', 'role': 'Purchase Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00339', 'parent': 'Supplier Quotation', 'read': 1, 'create': None, 'creation': '2009-06-30 16:46:11', 'modified': '2011-01-28 11:41:36', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 5, 'parenttype': 'DocType', 'role': 'All', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00352', 'parent': 'Supplier Quotation', 'read': 1, 'create': None, 'creation': '2009-07-13 15:34:08', 'modified': '2011-01-28 11:41:36', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 6, 'parenttype': 'DocType', 'role': 'Purchase User', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 2, 'match': None, 'parentfield': 'permissions'}, {'cancel': 0, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00353', 'parent': 'Supplier Quotation', 'read': 1, 'create': None, 'creation': '2009-07-13 15:34:08', 'modified': '2011-01-28 11:41:36', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 7, 'parenttype': 'DocType', 'role': 'Purchase Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 2, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2009-07-02 18:36:46', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Create PO', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 2, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': 1, 'icon': None, 'name': 'FL02520', 'idx': 1, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2009-06-30 15:39:38', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Basic Info', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Enter item rates and details of supplier who is providing quotation', 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02466', 'idx': 2, 'default': None, 'colour': 'White:FFF', 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Column Break', 'creation': '2009-06-30 16:09:56', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': None, 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02472', 'idx': 3, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-10-05 16:22:12', 'doctype': 'DocField', 'oldfieldname': 'naming_series', 'owner': 'ashwini@webnotestech.com', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Series', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06217', 'idx': 4, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'naming_series', 'fieldtype': 'Select', 'options': '\nSQTN', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-10-05 16:22:12', 'doctype': 'DocField', 'oldfieldname': 'status', 'owner': 'ashwini@webnotestech.com', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Status', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Supplier Quotation', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL06216', 'idx': 5, 'default': 'Draft', 'colour': 'White:FFF', 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'status', 'fieldtype': 'Select', 'options': '\nDraft\nQuotation Sent\nOrder Confirmed\nCancelled', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2009-06-30 16:09:56', 'doctype': 'DocField', 'oldfieldname': 'transaction_date', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Quotation Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'The date at which current entry is made in system.', 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02471', 'idx': 6, 'default': 'Today', 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'transaction_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2010-10-04 12:45:02', 'doctype': 'DocField', 'oldfieldname': 'activity_log_text', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Activity Log Text', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 2, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06184', 'idx': 7, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'activity_log_text', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-09-15 15:06:53', 'doctype': 'DocField', 'oldfieldname': 'company', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'For Company', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02993', 'idx': 8, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'company', 'fieldtype': 'Link', 'options': 'Company', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-09-15 15:06:53', 'doctype': 'DocField', 'oldfieldname': 'fiscal_year', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Fiscal Year', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02992', 'idx': 9, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'fiscal_year', 'fieldtype': 'Select', 'options': 'link:Fiscal Year', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Data', 'creation': '2010-10-11 14:18:04', 'doctype': 'DocField', 'oldfieldname': 'amended_from', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Amended From', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06247', 'idx': 10, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'amended_from', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Date', 'creation': '2010-10-11 14:18:04', 'doctype': 'DocField', 'oldfieldname': 'amendment_date', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Amendment Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06246', 'idx': 11, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'amendment_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Column Break', 'creation': '2009-06-30 16:09:56', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': None, 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02473', 'idx': 12, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2009-07-15 11:45:33', 'doctype': 'DocField', 'oldfieldname': 'approval_status', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Approval Status', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 2, 'description': 'You can create PO when quotation gets approved.', 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': 0, 'icon': None, 'name': 'FL02577', 'idx': 13, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'approval_status', 'fieldtype': 'Select', 'options': '\nApproved\nNot Approved', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2009-09-15 11:38:56', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Approve / Unapprove', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 2, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': 1, 'icon': None, 'name': 'FL02990', 'idx': 14, 'default': None, 'colour': 'White:FFF', 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-06-30 15:39:38', 'doctype': 'DocField', 'oldfieldname': 'supplier', 'owner': 'Administrator', 'reqd': 1, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Supplier', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02460', 'idx': 15, 'default': None, 'colour': 'White:FFF', 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'supplier', 'fieldtype': 'Link', 'options': 'Supplier', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-10-05 16:22:12', 'doctype': 'DocField', 'oldfieldname': 'supplier_name', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Supplier Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06218', 'idx': 16, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'supplier_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-06-30 15:39:38', 'doctype': 'DocField', 'oldfieldname': 'supplier_address', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Supplier Address', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02461', 'idx': 17, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'supplier_address', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-06-30 15:39:38', 'doctype': 'DocField', 'oldfieldname': 'contact_person', 'owner': 'Administrator', 'reqd': None, 'in_filter': 0, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Contact Person', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02462', 'idx': 18, 'default': None, 'colour': 'White:FFF', 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'contact_person', 'fieldtype': 'Link', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-06-30 15:39:38', 'doctype': 'DocField', 'oldfieldname': 'contact_no', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Contact No', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02463', 'idx': 19, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'contact_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-06-30 15:39:38', 'doctype': 'DocField', 'oldfieldname': 'email', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Email', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02464', 'idx': 20, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'email', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2009-06-30 15:39:38', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Item Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02465', 'idx': 21, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': 'Simple', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-06-30 15:39:38', 'doctype': 'DocField', 'oldfieldname': 'rfq_no', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'RFQ No', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02459', 'idx': 22, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'rfq_no', 'fieldtype': 'Link', 'options': 'RFQ', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2009-09-15 11:38:56', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Get Items', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02989', 'idx': 23, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'get_rfq_details', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Column Break', 'creation': '2010-10-12 11:46:18', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': None, 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06271', 'idx': 24, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-10-12 11:46:18', 'doctype': 'DocField', 'oldfieldname': 'currency', 'owner': 'ashwini@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Currency', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': "Supplier's currency", 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06274', 'idx': 25, 'default': None, 'colour': 'White:FFF', 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'currency', 'fieldtype': 'Select', 'options': 'link:Currency', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': 1, 'oldfieldtype': 'Currency', 'creation': '2010-10-12 11:46:18', 'doctype': 'DocField', 'oldfieldname': 'conversion_rate', 'owner': 'ashwini@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Conversion Rate', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': "Rate at which supplier's currency is converted to your currency", 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06273', 'idx': 26, 'default': '1', 'colour': 'White:FFF', 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'conversion_rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-10-12 11:46:18', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': None, 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06272', 'idx': 27, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': 'Simple', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Table', 'creation': '2009-06-30 15:39:38', 'doctype': 'DocField', 'oldfieldname': 'supplier_quotation_details', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Quotation Details1', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02468', 'idx': 28, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'supplier_quotation_details', 'fieldtype': 'Table', 'options': 'Supplier Quotation Detail', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-06-30 15:39:38', 'doctype': 'DocField', 'oldfieldname': 'net_total', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Net Total', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02469', 'idx': 29, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'net_total', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-10-05 16:22:12', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Terms', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Enter terms and conditions which you want to include', 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06219', 'idx': 30, 'default': None, 'colour': 'White:FFF', 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-10-11 09:25:18', 'doctype': 'DocField', 'oldfieldname': 'tc_name', 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Select Terms', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06243', 'idx': 31, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'tc_name', 'fieldtype': 'Link', 'options': 'Term', 'report_hide': 1, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2010-10-11 09:25:18', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Get Terms', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06244', 'idx': 32, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'get_tc_details', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'HTML', 'creation': '2010-10-11 09:25:18', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Terms HTML', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06245', 'idx': 33, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': 'You can add Terms and Notes that will be printed in the Transaction', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text Editor', 'creation': '2009-06-30 15:39:38', 'doctype': 'DocField', 'oldfieldname': 'terms', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Terms and Conditions', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02470', 'idx': 34, 'default': None, 'colour': None, 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': 'terms', 'fieldtype': 'Text Editor', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-10-06 08:50:05', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'ashwini@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Next Steps', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': "Next steps will be visible when you submit the supplier quotation and approval status is 'Approved'", 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL06234', 'idx': 35, 'default': None, 'colour': 'White:FFF', 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2009-09-01 11:18:39', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Get Report', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Supplier Quotation', 'search_index': None, 'allow_on_submit': 1, 'icon': None, 'name': 'FL02910', 'idx': 36, 'default': None, 'colour': 'White:FFF', 'modified': '2011-01-28 11:41:36', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/srm/page/__init__.py b/srm/page/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/search_criteria/__init__.py b/srm/search_criteria/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/search_criteria/itemwise_purchase_details/__init__.py b/srm/search_criteria/itemwise_purchase_details/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/search_criteria/itemwise_receipt_details/__init__.py b/srm/search_criteria/itemwise_receipt_details/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/search_criteria/pending_po_items_to_bill/__init__.py b/srm/search_criteria/pending_po_items_to_bill/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/search_criteria/pending_po_items_to_receive/__init__.py b/srm/search_criteria/pending_po_items_to_receive/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/srm/search_criteria/purchase_in_transit/__init__.py b/srm/search_criteria/purchase_in_transit/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/event_handlers.py b/startup/event_handlers.py
similarity index 100%
rename from event_handlers.py
rename to startup/event_handlers.py
diff --git a/accounts/DocType Label/QA Inspection Report/QA Inspection Report.txt b/stock/DocType Label/QA Inspection Report/QA Inspection Report.txt
similarity index 100%
rename from accounts/DocType Label/QA Inspection Report/QA Inspection Report.txt
rename to stock/DocType Label/QA Inspection Report/QA Inspection Report.txt
diff --git a/mapper/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt b/stock/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt
similarity index 100%
rename from mapper/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt
rename to stock/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt
diff --git a/mapper/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt b/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
similarity index 100%
rename from mapper/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
rename to stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
diff --git a/mapper/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt b/stock/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt
similarity index 100%
rename from mapper/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt
rename to stock/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt
diff --git a/mapper/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt b/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt
similarity index 100%
rename from mapper/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt
rename to stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt
diff --git a/material_management/Item Group/All Item Groups/All Item Groups.txt b/stock/Item Group/All Item Groups/All Item Groups.txt
similarity index 100%
rename from material_management/Item Group/All Item Groups/All Item Groups.txt
rename to stock/Item Group/All Item Groups/All Item Groups.txt
diff --git a/material_management/Item Group/Default/Default.txt b/stock/Item Group/Default/Default.txt
similarity index 100%
rename from material_management/Item Group/Default/Default.txt
rename to stock/Item Group/Default/Default.txt
diff --git a/material_management/Module Def/Material Management/Material Management.txt b/stock/Module Def/Stock/Stock.txt
similarity index 66%
rename from material_management/Module Def/Material Management/Material Management.txt
rename to stock/Module Def/Stock/Stock.txt
index fe9d0a9b6c..eae0a2e84c 100644
--- a/material_management/Module Def/Material Management/Material Management.txt	
+++ b/stock/Module Def/Stock/Stock.txt	
@@ -1,23 +1,24 @@
 [
 	{
-		'creation': '2010-09-25 10:50:35',
+		'_last_update': None,
+		'creation': '2011-06-30 15:49:38',
 		'disabled': 'No',
 		'docstatus': 0,
 		'doctype': u'Module Def',
-		'doctype_list': None,
+		'doctype_list': 'DocType Label, QA Inspection Report',
 		'file_list': None,
 		'idx': None,
-		'is_hidden': None,
-		'last_updated_date': '2010-11-29 12:02:02',
-		'modified': '2011-04-19 11:49:10',
+		'is_hidden': 'No',
+		'last_updated_date': None,
+		'modified': '2011-07-01 09:36:22',
 		'modified_by': 'Administrator',
 		'module_desc': 'Material Management',
 		'module_icon': 'Stock.gif',
 		'module_label': 'Stock',
-		'module_name': 'Material Management',
+		'module_name': 'Stock',
 		'module_page': None,
-		'module_seq': 6,
-		'name': 'Material Management',
+		'module_seq': 7,
+		'name': 'Stock',
 		'owner': 'Administrator',
 		'parent': None,
 		'parentfield': None,
@@ -27,7 +28,7 @@
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:49:38',
 		'description': 'Item master',
 		'display_name': 'Item',
 		'doc_name': 'Item',
@@ -38,17 +39,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 1,
-		'modified': '2011-05-09 11:04:26',
+		'modified': '2011-07-01 09:36:22',
 		'modified_by': 'Administrator',
-		'name': 'MDI01077',
+		'name': 'MDI01321',
 		'owner': 'Administrator',
-		'parent': 'Material Management',
+		'parent': 'Stock',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:49:38',
 		'description': 'Record of items added, removed or moved from one warehouse to another.',
 		'display_name': 'Stock Entry',
 		'doc_name': 'Stock Entry',
@@ -59,17 +60,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 2,
-		'modified': '2011-05-09 11:04:26',
+		'modified': '2011-07-01 09:36:22',
 		'modified_by': 'Administrator',
-		'name': 'MDI01078',
+		'name': 'MDI01322',
 		'owner': 'Administrator',
-		'parent': 'Material Management',
+		'parent': 'Stock',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:49:38',
 		'description': 'Record of items delivered to your customers along with the Printed Note',
 		'display_name': 'Delivery Note',
 		'doc_name': 'Delivery Note',
@@ -80,17 +81,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 3,
-		'modified': '2011-05-09 11:04:26',
+		'modified': '2011-07-01 09:36:22',
 		'modified_by': 'Administrator',
-		'name': 'MDI01079',
+		'name': 'MDI01323',
 		'owner': 'Administrator',
-		'parent': 'Material Management',
+		'parent': 'Stock',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:49:38',
 		'description': 'Record of incoming material from your suppliers',
 		'display_name': 'Purchase Receipt',
 		'doc_name': 'Purchase Receipt',
@@ -101,17 +102,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 4,
-		'modified': '2011-05-09 11:04:26',
+		'modified': '2011-07-01 09:36:22',
 		'modified_by': 'Administrator',
-		'name': 'MDI01080',
+		'name': 'MDI01324',
 		'owner': 'Administrator',
-		'parent': 'Material Management',
+		'parent': 'Stock',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:49:38',
 		'description': 'Details of Installation done after delivery',
 		'display_name': 'Installation Note',
 		'doc_name': 'Installation Note',
@@ -122,17 +123,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 5,
-		'modified': '2011-05-09 11:04:26',
+		'modified': '2011-07-01 09:36:22',
 		'modified_by': 'Administrator',
-		'name': 'MDI01081',
+		'name': 'MDI01325',
 		'owner': 'Administrator',
-		'parent': 'Material Management',
+		'parent': 'Stock',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:49:38',
 		'description': 'Create Quality Inspection Report for any item',
 		'display_name': 'Inspection Report',
 		'doc_name': 'QA Inspection Report',
@@ -143,17 +144,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 6,
-		'modified': '2011-05-09 11:04:26',
+		'modified': '2011-07-01 09:36:22',
 		'modified_by': 'Administrator',
-		'name': 'MDI01082',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Material Management',
+		'name': 'MDI01326',
+		'owner': 'Administrator',
+		'parent': 'Stock',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:49:38',
 		'description': 'Reconcile your stock by uploading it form an excel file',
 		'display_name': 'Stock Reconciliation',
 		'doc_name': 'Stock Reconciliation',
@@ -164,17 +165,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 7,
-		'modified': '2011-05-09 11:04:26',
+		'modified': '2011-07-01 09:36:22',
 		'modified_by': 'Administrator',
-		'name': 'MDI01083',
+		'name': 'MDI01327',
 		'owner': 'Administrator',
-		'parent': 'Material Management',
+		'parent': 'Stock',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:49:38',
 		'description': 'This utility tool will update Stock UOM in Item and will respectively update Actual Qty in Stock Ledger as per Conversion Factor.',
 		'display_name': 'Stock UOM Replace Utility',
 		'doc_name': 'Stock UOM Replace Utility',
@@ -185,17 +186,17 @@
 		'hide': None,
 		'icon': None,
 		'idx': 8,
-		'modified': '2011-05-09 11:04:26',
+		'modified': '2011-07-01 09:36:22',
 		'modified_by': 'Administrator',
-		'name': 'MDI01084',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Material Management',
+		'name': 'MDI01328',
+		'owner': 'Administrator',
+		'parent': 'Stock',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:49:38',
 		'description': 'This utility will help in tracking stock for Sales Return and Purchase Return.',
 		'display_name': 'Sales and Purchase Return Wizard',
 		'doc_name': 'Sales and Purchase Return Wizard',
@@ -206,17 +207,59 @@
 		'hide': None,
 		'icon': None,
 		'idx': 9,
-		'modified': '2011-05-09 11:04:26',
+		'modified': '2011-07-01 09:36:22',
 		'modified_by': 'Administrator',
-		'name': 'MDI01085',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Material Management',
+		'name': 'MDI01329',
+		'owner': 'Administrator',
+		'parent': 'Stock',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 18:57:58',
+		'description': 'You can create master template for landed cost wizard',
+		'display_name': 'Landed Cost Master',
+		'doc_name': 'Landed Cost Master',
+		'doc_type': 'Forms',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': None,
+		'hide': None,
+		'icon': 'accept.gif',
+		'idx': 10,
+		'modified': '2011-07-01 09:36:22',
+		'modified_by': 'Administrator',
+		'name': 'MDI01372',
+		'owner': 'Administrator',
+		'parent': 'Stock',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 18:57:58',
+		'description': 'Add extra expenses into Purchase Receipt which should be consider for item valuation. The cost will be added proportionately as per purchase receipt value.',
+		'display_name': 'Landed Cost Wizard',
+		'doc_name': 'Landed Cost Wizard',
+		'doc_type': 'Forms',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': None,
+		'hide': None,
+		'icon': 'accept.gif',
+		'idx': 11,
+		'modified': '2011-07-01 09:36:22',
+		'modified_by': 'Administrator',
+		'name': 'MDI01371',
+		'owner': 'Administrator',
+		'parent': 'Stock',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:49:38',
 		'description': None,
 		'display_name': 'Stock Ledger',
 		'doc_name': 'Stock Ledger Entry',
@@ -226,18 +269,18 @@
 		'fields': None,
 		'hide': None,
 		'icon': None,
-		'idx': 10,
-		'modified': '2011-05-09 11:04:26',
+		'idx': 12,
+		'modified': '2011-07-01 09:36:22',
 		'modified_by': 'Administrator',
-		'name': 'MDI01088',
+		'name': 'MDI01330',
 		'owner': 'Administrator',
-		'parent': 'Material Management',
+		'parent': 'Stock',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:49:38',
 		'description': None,
 		'display_name': 'Stock Level',
 		'doc_name': 'Bin',
@@ -247,18 +290,18 @@
 		'fields': None,
 		'hide': None,
 		'icon': None,
-		'idx': 11,
-		'modified': '2011-05-09 11:04:26',
+		'idx': 13,
+		'modified': '2011-07-01 09:36:22',
 		'modified_by': 'Administrator',
-		'name': 'MDI01089',
+		'name': 'MDI01331',
 		'owner': 'Administrator',
-		'parent': 'Material Management',
+		'parent': 'Stock',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:49:38',
 		'description': None,
 		'display_name': 'Shortage To Indent',
 		'doc_name': 'Item',
@@ -268,18 +311,18 @@
 		'fields': None,
 		'hide': None,
 		'icon': None,
-		'idx': 12,
-		'modified': '2011-05-09 11:04:26',
+		'idx': 14,
+		'modified': '2011-07-01 09:36:22',
 		'modified_by': 'Administrator',
-		'name': 'MDI01090',
+		'name': 'MDI01332',
 		'owner': 'Administrator',
-		'parent': 'Material Management',
+		'parent': 'Stock',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:49:38',
 		'description': 'Stock Value as per Item and Warehouse',
 		'display_name': 'Stock Report',
 		'doc_name': 'Stock Ledger Entry',
@@ -289,18 +332,18 @@
 		'fields': None,
 		'hide': None,
 		'icon': None,
-		'idx': 13,
-		'modified': '2011-05-09 11:04:26',
+		'idx': 15,
+		'modified': '2011-07-01 09:36:22',
 		'modified_by': 'Administrator',
-		'name': 'MDI01091',
+		'name': 'MDI01333',
 		'owner': 'Administrator',
-		'parent': 'Material Management',
+		'parent': 'Stock',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
 		'click_function': None,
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:49:38',
 		'description': None,
 		'display_name': 'Stock Aging Report',
 		'doc_name': 'Serial No',
@@ -310,67 +353,67 @@
 		'fields': None,
 		'hide': None,
 		'icon': None,
-		'idx': 14,
-		'modified': '2011-05-09 11:04:26',
+		'idx': 16,
+		'modified': '2011-07-01 09:36:22',
 		'modified_by': 'Administrator',
-		'name': 'MDI01092',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Material Management',
+		'name': 'MDI01334',
+		'owner': 'Administrator',
+		'parent': 'Stock',
 		'parentfield': 'items',
 		'parenttype': 'Module Def'
 	},
 	{
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:49:38',
 		'docstatus': 0,
 		'doctype': 'Module Def Role',
 		'idx': 1,
-		'modified': '2010-09-25 10:50:35',
+		'modified': '2011-07-01 09:36:22',
 		'modified_by': 'Administrator',
-		'name': 'MDR00292',
+		'name': 'MDR00336',
 		'owner': 'Administrator',
-		'parent': 'Material Management',
+		'parent': 'Stock',
 		'parentfield': 'roles',
 		'parenttype': 'Module Def',
 		'role': 'Material User'
 	},
 	{
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:49:38',
 		'docstatus': 0,
 		'doctype': 'Module Def Role',
 		'idx': 2,
-		'modified': '2010-09-25 10:50:35',
+		'modified': '2011-07-01 09:36:22',
 		'modified_by': 'Administrator',
-		'name': 'MDR00293',
+		'name': 'MDR00337',
 		'owner': 'Administrator',
-		'parent': 'Material Management',
+		'parent': 'Stock',
 		'parentfield': 'roles',
 		'parenttype': 'Module Def',
 		'role': 'Material Master Manager'
 	},
 	{
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:49:38',
 		'docstatus': 0,
 		'doctype': 'Module Def Role',
 		'idx': 3,
-		'modified': '2010-09-25 10:50:35',
+		'modified': '2011-07-01 09:36:22',
 		'modified_by': 'Administrator',
-		'name': 'MDR00294',
+		'name': 'MDR00338',
 		'owner': 'Administrator',
-		'parent': 'Material Management',
+		'parent': 'Stock',
 		'parentfield': 'roles',
 		'parenttype': 'Module Def',
 		'role': 'Material Manager'
 	},
 	{
-		'creation': '2010-09-25 10:50:35',
+		'creation': '2011-06-30 15:49:38',
 		'docstatus': 0,
 		'doctype': 'Module Def Role',
 		'idx': 4,
-		'modified': '2010-09-25 10:50:35',
+		'modified': '2011-07-01 09:36:22',
 		'modified_by': 'Administrator',
-		'name': 'MDR00295',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Material Management',
+		'name': 'MDR00339',
+		'owner': 'Administrator',
+		'parent': 'Stock',
 		'parentfield': 'roles',
 		'parenttype': 'Module Def',
 		'role': 'Quality Manager'
diff --git a/material_management/Print Format/Purchase Receipt Format/Purchase Receipt Format.txt b/stock/Print Format/Purchase Receipt Format/Purchase Receipt Format.txt
similarity index 100%
rename from material_management/Print Format/Purchase Receipt Format/Purchase Receipt Format.txt
rename to stock/Print Format/Purchase Receipt Format/Purchase Receipt Format.txt
diff --git a/roles/Role/Material Manager/Material Manager.txt b/stock/Role/Material Manager/Material Manager.txt
similarity index 100%
rename from roles/Role/Material Manager/Material Manager.txt
rename to stock/Role/Material Manager/Material Manager.txt
diff --git a/roles/Role/Material Master Manager/Material Master Manager.txt b/stock/Role/Material Master Manager/Material Master Manager.txt
similarity index 100%
rename from roles/Role/Material Master Manager/Material Master Manager.txt
rename to stock/Role/Material Master Manager/Material Master Manager.txt
diff --git a/roles/Role/Material User/Material User.txt b/stock/Role/Material User/Material User.txt
similarity index 100%
rename from roles/Role/Material User/Material User.txt
rename to stock/Role/Material User/Material User.txt
diff --git a/roles/Role/Quality Manager/Quality Manager.txt b/stock/Role/Quality Manager/Quality Manager.txt
similarity index 100%
rename from roles/Role/Quality Manager/Quality Manager.txt
rename to stock/Role/Quality Manager/Quality Manager.txt
diff --git a/payroll/doctype/deduction_type/__init__.py b/stock/__init__.py
similarity index 100%
rename from payroll/doctype/deduction_type/__init__.py
rename to stock/__init__.py
diff --git a/payroll/doctype/department/__init__.py b/stock/doctype/__init__.py
similarity index 100%
rename from payroll/doctype/department/__init__.py
rename to stock/doctype/__init__.py
diff --git a/payroll/doctype/designation/__init__.py b/stock/doctype/batch/__init__.py
similarity index 100%
rename from payroll/doctype/designation/__init__.py
rename to stock/doctype/batch/__init__.py
diff --git a/stock/doctype/batch/batch.txt b/stock/doctype/batch/batch.txt
new file mode 100644
index 0000000000..f589b12401
--- /dev/null
+++ b/stock/doctype/batch/batch.txt
@@ -0,0 +1,158 @@
+# DocType, Batch
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:52',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'autoname': 'field:batch_id',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Stock',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 12
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Batch',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Batch',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'role': 'Material Master Manager'
+	},
+
+	# DocType, Batch
+	{
+		'doctype': 'DocType',
+		'name': 'Batch'
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'batch_id',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Batch ID',
+		'no_copy': 1,
+		'oldfieldname': 'batch_id',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Small Text',
+		'idx': 3,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'start_date',
+		'fieldtype': 'Date',
+		'idx': 4,
+		'label': 'Batch Started Date',
+		'oldfieldname': 'start_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'finished_date',
+		'fieldtype': 'Date',
+		'idx': 5,
+		'label': 'Batch Finished Date',
+		'oldfieldname': 'finished_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'expiry_date',
+		'fieldtype': 'Date',
+		'idx': 6,
+		'label': 'Expiry Date',
+		'oldfieldname': 'expiry_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item',
+		'fieldtype': 'Link',
+		'idx': 7,
+		'label': 'Item',
+		'oldfieldname': 'item',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'reqd': 1
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/earn_deduction_detail/__init__.py b/stock/doctype/bin/__init__.py
similarity index 100%
rename from payroll/doctype/earn_deduction_detail/__init__.py
rename to stock/doctype/bin/__init__.py
diff --git a/material_management/doctype/bin/bin.py b/stock/doctype/bin/bin.py
similarity index 100%
rename from material_management/doctype/bin/bin.py
rename to stock/doctype/bin/bin.py
diff --git a/stock/doctype/bin/bin.txt b/stock/doctype/bin/bin.txt
new file mode 100644
index 0000000000..2ecbcf0d3c
--- /dev/null
+++ b/stock/doctype/bin/bin.txt
@@ -0,0 +1,299 @@
+# DocType, Bin
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:52',
+		'docstatus': 0,
+		'modified': '2010-12-16 23:57:05',
+		'modified_by': 'nabin@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308741898',
+		'autoname': 'BIN/.#######',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'hide_toolbar': 1,
+		'in_create': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'read_only': 0,
+		'search_fields': 'item_code,warehouse',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 114
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Bin',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 1
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Bin',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Bin
+	{
+		'doctype': 'DocType',
+		'name': 'Bin'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Sales Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'Sales User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Purchase Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'Purchase User'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 1,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 0,
+		'role': 'Material Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'warehouse',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'in_filter': 1,
+		'label': 'Warehouse',
+		'oldfieldname': 'warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'warehouse_type',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Warehouse Type',
+		'oldfieldname': 'warehouse_type',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'reserved_qty',
+		'fieldtype': 'Currency',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Reserved Quantity',
+		'oldfieldname': 'reserved_qty',
+		'oldfieldtype': 'Currency',
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'actual_qty',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Actual Quantity',
+		'oldfieldname': 'actual_qty',
+		'oldfieldtype': 'Currency',
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'ordered_qty',
+		'fieldtype': 'Currency',
+		'idx': 7,
+		'in_filter': 1,
+		'label': 'Ordered Quantity',
+		'oldfieldname': 'ordered_qty',
+		'oldfieldtype': 'Currency',
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'indented_qty',
+		'fieldtype': 'Currency',
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'Indented Quantity',
+		'oldfieldname': 'indented_qty',
+		'oldfieldtype': 'Currency',
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'planned_qty',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'in_filter': 1,
+		'label': 'Planned Qty',
+		'oldfieldname': 'planned_qty',
+		'oldfieldtype': 'Currency',
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'projected_qty',
+		'fieldtype': 'Currency',
+		'idx': 10,
+		'in_filter': 1,
+		'label': 'Projected Qty',
+		'oldfieldname': 'projected_qty',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'ma_rate',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 11,
+		'in_filter': 0,
+		'label': 'Moving Average Rate',
+		'oldfieldname': 'ma_rate',
+		'oldfieldtype': 'Currency',
+		'print_hide': 1,
+		'report_hide': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_uom',
+		'fieldtype': 'Data',
+		'idx': 12,
+		'in_filter': 1,
+		'label': 'UOM',
+		'oldfieldname': 'stock_uom',
+		'oldfieldtype': 'Data',
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fcfs_rate',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 12,
+		'label': 'FCFS Rate',
+		'oldfieldname': 'fcfs_rate',
+		'oldfieldtype': 'Currency',
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'valuation_rate',
+		'fieldtype': 'Currency',
+		'idx': 13,
+		'label': 'Valuation Rate',
+		'oldfieldname': 'valuation_rate',
+		'oldfieldtype': 'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_value',
+		'fieldtype': 'Currency',
+		'idx': 14,
+		'label': 'Stock Value',
+		'oldfieldname': 'stock_value',
+		'oldfieldtype': 'Currency'
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/earning_detail/__init__.py b/stock/doctype/delivery_note/__init__.py
similarity index 100%
rename from payroll/doctype/earning_detail/__init__.py
rename to stock/doctype/delivery_note/__init__.py
diff --git a/material_management/doctype/delivery_note/delivery_note.js b/stock/doctype/delivery_note/delivery_note.js
similarity index 100%
rename from material_management/doctype/delivery_note/delivery_note.js
rename to stock/doctype/delivery_note/delivery_note.js
diff --git a/material_management/doctype/delivery_note/delivery_note.py b/stock/doctype/delivery_note/delivery_note.py
similarity index 100%
rename from material_management/doctype/delivery_note/delivery_note.py
rename to stock/doctype/delivery_note/delivery_note.py
diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt
new file mode 100644
index 0000000000..0c1cc52c36
--- /dev/null
+++ b/stock/doctype/delivery_note/delivery_note.txt
@@ -0,0 +1,1510 @@
+# DocType, Delivery Note
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:57',
+		'docstatus': 0,
+		'modified': '2011-06-27 16:42:01',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1309173122',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Transaction',
+		'in_create': 0,
+		'is_transaction_doc': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'read_only_onload': 1,
+		'search_fields': 'status,transaction_date,customer,customer_name, territory,grand_total',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': 'To %(customer_name)s on %(transaction_date)s | %(per_billed)s% billed',
+		'tag_fields': 'billing_status',
+		'version': 444
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Delivery Note',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Delivery Note',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Delivery Note
+	{
+		'doctype': 'DocType',
+		'name': 'Delivery Note'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'Material User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'Material Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'Material Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Sales User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'Sales User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 7,
+		'permlevel': 0,
+		'role': 'Accounts User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 8,
+		'permlevel': 1,
+		'role': 'Accounts User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 9,
+		'match': 'customer_name',
+		'permlevel': 0,
+		'role': 'Customer'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 10,
+		'permlevel': 2,
+		'role': 'All',
+		'write': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Basic Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 2,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'trigger': 'Client',
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'To manage multiple series please go to Setup > Manage Series',
+		'doctype': 'DocField',
+		'fieldname': 'naming_series',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Series',
+		'no_copy': 1,
+		'oldfieldname': 'naming_series',
+		'oldfieldtype': 'Select',
+		'options': 'DN',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Customer',
+		'oldfieldname': 'customer',
+		'oldfieldtype': 'Link',
+		'options': 'Customer',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_address',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Shipping Address',
+		'options': 'Address',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_person',
+		'fieldtype': 'Link',
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Contact Person',
+		'options': 'Contact',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_name',
+		'fieldtype': 'Data',
+		'idx': 7,
+		'label': 'Customer Name',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'address_display',
+		'fieldtype': 'Small Text',
+		'idx': 8,
+		'label': 'Shipping Address',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_display',
+		'fieldtype': 'Small Text',
+		'idx': 9,
+		'label': 'Contact',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_mobile',
+		'fieldtype': 'Text',
+		'idx': 10,
+		'label': 'Mobile No',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_email',
+		'fieldtype': 'Text',
+		'idx': 11,
+		'label': 'Contact Email',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 12,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Today',
+		'description': 'The date at which current entry is made in system.',
+		'doctype': 'DocField',
+		'fieldname': 'transaction_date',
+		'fieldtype': 'Date',
+		'idx': 13,
+		'in_filter': 1,
+		'label': 'Voucher Date',
+		'no_copy': 1,
+		'oldfieldname': 'transaction_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'default': 'Draft',
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Select',
+		'idx': 14,
+		'in_filter': 1,
+		'label': 'Status',
+		'no_copy': 1,
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Select',
+		'options': '\nDraft\nSubmitted\nCancelled',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.__islocal',
+		'description': '% of materials billed against this Delivery Note',
+		'doctype': 'DocField',
+		'fieldname': 'per_billed',
+		'fieldtype': 'Currency',
+		'idx': 15,
+		'in_filter': 1,
+		'label': '% Qty Billed',
+		'no_copy': 1,
+		'oldfieldname': 'per_billed',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.__islocal',
+		'description': '% of materials delivered against this Delivery Note',
+		'doctype': 'DocField',
+		'fieldname': 'per_installed',
+		'fieldtype': 'Currency',
+		'idx': 16,
+		'in_filter': 1,
+		'label': '% Installed',
+		'no_copy': 1,
+		'oldfieldname': 'per_installed',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 0,
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'idx': 17,
+		'label': 'Amended From',
+		'no_copy': 1,
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'description': 'The date at which current entry is corrected in the system.',
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'idx': 18,
+		'label': 'Amendment Date',
+		'no_copy': 1,
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'territory',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 19,
+		'in_filter': 1,
+		'label': 'Territory',
+		'options': 'Territory',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_group',
+		'fieldtype': 'Link',
+		'idx': 20,
+		'in_filter': 1,
+		'label': 'Customer Group',
+		'options': 'Customer Group',
+		'permlevel': 0,
+		'print_hide': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 21,
+		'label': 'Transporter Info',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'transporter_name',
+		'fieldtype': 'Data',
+		'idx': 22,
+		'label': 'Transporter Name',
+		'no_copy': 0,
+		'oldfieldname': 'transporter_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0,
+		'trigger': 'Client',
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Transporter lorry number',
+		'doctype': 'DocField',
+		'fieldname': 'lr_no',
+		'fieldtype': 'Data',
+		'idx': 23,
+		'label': 'LR No',
+		'no_copy': 0,
+		'oldfieldname': 'lr_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Today',
+		'description': 'Date on which lorry started from your warehouse',
+		'doctype': 'DocField',
+		'fieldname': 'lr_date',
+		'fieldtype': 'Date',
+		'idx': 24,
+		'label': 'LR Date',
+		'no_copy': 0,
+		'oldfieldname': 'lr_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 25,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'challan_no',
+		'fieldtype': 'Data',
+		'idx': 26,
+		'label': 'Challan No',
+		'oldfieldname': 'challan_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'challan_date',
+		'fieldtype': 'Date',
+		'idx': 27,
+		'label': 'Challan Date',
+		'oldfieldname': 'challan_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 28,
+		'label': 'Items',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'You can make a delivery note from multiple sales orders. Select sales orders one by one and click on the button below.',
+		'doctype': 'DocField',
+		'fieldname': 'sales_order_no',
+		'fieldtype': 'Link',
+		'idx': 29,
+		'label': 'Sales Order No',
+		'no_copy': 0,
+		'oldfieldname': 'sales_order_no',
+		'oldfieldtype': 'Link',
+		'options': 'Sales Order',
+		'permlevel': 0,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'hidden': 0,
+		'idx': 30,
+		'label': 'Get Items',
+		'oldfieldtype': 'Button',
+		'options': 'pull_sales_order_details',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Select the price list as entered in "Price List" master. This will pull the reference rates of items against this price list as specified in "Item" master.',
+		'doctype': 'DocField',
+		'fieldname': 'price_list_name',
+		'fieldtype': 'Select',
+		'idx': 31,
+		'label': 'Price List',
+		'oldfieldname': 'price_list_name',
+		'oldfieldtype': 'Select',
+		'options': 'link:Price List',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 32,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': "Customer's Currency",
+		'doctype': 'DocField',
+		'fieldname': 'currency',
+		'fieldtype': 'Select',
+		'idx': 33,
+		'label': 'Currency',
+		'oldfieldname': 'currency',
+		'oldfieldtype': 'Select',
+		'options': 'link:Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': '1.00',
+		'description': "Rate at which customer's currency is converted to your currency",
+		'doctype': 'DocField',
+		'fieldname': 'conversion_rate',
+		'fieldtype': 'Currency',
+		'idx': 34,
+		'label': 'Conversion Rate',
+		'no_copy': 0,
+		'oldfieldname': 'conversion_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 35,
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'delivery_note_details',
+		'fieldtype': 'Table',
+		'idx': 36,
+		'label': 'Delivery Note Details',
+		'no_copy': 0,
+		'oldfieldname': 'delivery_note_details',
+		'oldfieldtype': 'Table',
+		'options': 'Delivery Note Detail',
+		'permlevel': 0,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'net_total',
+		'fieldtype': 'Currency',
+		'idx': 37,
+		'label': 'Net Total*',
+		'no_copy': 0,
+		'oldfieldname': 'net_total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 38,
+		'label': 'Re-Calculate Values',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 39,
+		'label': 'Note',
+		'oldfieldtype': 'HTML',
+		'options': 'NOTE :* In Base Currency',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 40,
+		'label': 'Taxes',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'If you have created a standard template in Other Charges master, select one and click on the button below.',
+		'doctype': 'DocField',
+		'fieldname': 'charge',
+		'fieldtype': 'Link',
+		'idx': 41,
+		'label': 'Charge',
+		'oldfieldname': 'charge',
+		'oldfieldtype': 'Link',
+		'options': 'Other Charges',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 42,
+		'label': 'Get Charges',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'other_charges',
+		'fieldtype': 'Table',
+		'idx': 43,
+		'label': 'Other Charges',
+		'no_copy': 0,
+		'oldfieldname': 'other_charges',
+		'oldfieldtype': 'Table',
+		'options': 'RV Tax Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'other_charges_total',
+		'fieldtype': 'Currency',
+		'idx': 44,
+		'label': 'Charges Total',
+		'oldfieldname': 'other_charges_total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 45,
+		'label': 'Calculate Charges',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 46,
+		'label': 'Other Charges Calculation',
+		'oldfieldtype': 'HTML',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 47,
+		'label': 'Totals',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'grand_total',
+		'fieldtype': 'Currency',
+		'idx': 48,
+		'label': 'Grand Total',
+		'no_copy': 0,
+		'oldfieldname': 'grand_total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rounded_total',
+		'fieldtype': 'Currency',
+		'idx': 49,
+		'label': 'Rounded Total',
+		'no_copy': 0,
+		'oldfieldname': 'rounded_total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'In Words will be visible once you save the Delivery Note.',
+		'doctype': 'DocField',
+		'fieldname': 'in_words',
+		'fieldtype': 'Data',
+		'idx': 50,
+		'label': 'In Words',
+		'no_copy': 0,
+		'oldfieldname': 'in_words',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 51,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'grand_total_export',
+		'fieldtype': 'Currency',
+		'idx': 52,
+		'label': 'Grand Total (Export)',
+		'no_copy': 0,
+		'oldfieldname': 'grand_total_export',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rounded_total_export',
+		'fieldtype': 'Currency',
+		'idx': 53,
+		'label': 'Rounded Total (Export)',
+		'no_copy': 0,
+		'oldfieldname': 'rounded_total_export',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'In Words (Export) will be visible once you save the Delivery Note.',
+		'doctype': 'DocField',
+		'fieldname': 'in_words_export',
+		'fieldtype': 'Data',
+		'idx': 54,
+		'label': 'In Words (Export)',
+		'no_copy': 0,
+		'oldfieldname': 'in_words_export',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 55,
+		'label': 'Terms',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tc_name',
+		'fieldtype': 'Link',
+		'idx': 56,
+		'label': 'Select Terms',
+		'oldfieldname': 'tc_name',
+		'oldfieldtype': 'Link',
+		'options': 'Term',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 57,
+		'label': 'Get Terms',
+		'oldfieldtype': 'Button',
+		'options': 'get_tc_details',
+		'permlevel': 0,
+		'trigger': 'Server'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 58,
+		'label': 'Terms HTML',
+		'oldfieldtype': 'HTML',
+		'options': 'You can add Terms and Notes that will be printed in the Transaction',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'terms',
+		'fieldtype': 'Text Editor',
+		'idx': 59,
+		'label': 'Term Details',
+		'oldfieldname': 'terms',
+		'oldfieldtype': 'Text Editor',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Filling in Additional Information about the Delivery Note will help you analyze your data better.',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 60,
+		'label': 'More Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Select the relevant company name if you have multiple companies',
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 61,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 62,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Today',
+		'description': 'The date at which current entry will get or has actually executed.',
+		'doctype': 'DocField',
+		'fieldname': 'posting_date',
+		'fieldtype': 'Date',
+		'idx': 63,
+		'in_filter': 1,
+		'label': 'Posting Date',
+		'no_copy': 1,
+		'oldfieldname': 'posting_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Time at which items were delivered from warehouse',
+		'doctype': 'DocField',
+		'fieldname': 'posting_time',
+		'fieldtype': 'Time',
+		'idx': 64,
+		'in_filter': 0,
+		'label': 'Posting Time',
+		'oldfieldname': 'posting_time',
+		'oldfieldtype': 'Time',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Track this Delivery Note against any Project',
+		'doctype': 'DocField',
+		'fieldname': 'project_name',
+		'fieldtype': 'Link',
+		'idx': 65,
+		'in_filter': 1,
+		'label': 'Project Name',
+		'oldfieldname': 'project_name',
+		'oldfieldtype': 'Link',
+		'options': 'Project',
+		'permlevel': 0,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Required only for sample item.',
+		'doctype': 'DocField',
+		'fieldname': 'to_warehouse',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 66,
+		'label': 'To Warehouse',
+		'no_copy': 1,
+		'oldfieldname': 'to_warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 67,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'billing_status',
+		'fieldtype': 'Select',
+		'hidden': 1,
+		'idx': 68,
+		'label': 'Billing Status',
+		'no_copy': 1,
+		'options': '\nNot Billed\nPartly Billed\nFully Billed',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'installation_status',
+		'fieldtype': 'Select',
+		'hidden': 1,
+		'idx': 69,
+		'label': 'Installation Status',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'po_no',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 70,
+		'label': 'P.O. No',
+		'no_copy': 0,
+		'oldfieldname': 'po_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'po_date',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 71,
+		'label': 'P.O. Date',
+		'no_copy': 0,
+		'oldfieldname': 'po_date',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'letter_head',
+		'fieldtype': 'Select',
+		'idx': 72,
+		'label': 'Letter Head',
+		'oldfieldname': 'letter_head',
+		'oldfieldtype': 'Link',
+		'options': 'link:Letter Head',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'source',
+		'fieldtype': 'Select',
+		'idx': 73,
+		'label': 'Source',
+		'oldfieldname': 'source',
+		'oldfieldtype': 'Select',
+		'options': "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': "eval:doc.source == 'Campaign'",
+		'doctype': 'DocField',
+		'fieldname': 'campaign',
+		'fieldtype': 'Link',
+		'idx': 74,
+		'label': 'Campaign',
+		'oldfieldname': 'campaign',
+		'oldfieldtype': 'Link',
+		'options': 'Campaign',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'select_print_heading',
+		'fieldtype': 'Link',
+		'idx': 75,
+		'label': 'Select Print Heading',
+		'no_copy': 1,
+		'oldfieldname': 'select_print_heading',
+		'oldfieldtype': 'Link',
+		'options': 'Print Heading',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'print_without_amount',
+		'fieldtype': 'Check',
+		'idx': 76,
+		'label': 'Print Without Amount',
+		'oldfieldname': 'print_without_amount',
+		'oldfieldtype': 'Check',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'instructions',
+		'fieldtype': 'Text',
+		'idx': 77,
+		'label': 'Instructions',
+		'oldfieldname': 'instructions',
+		'oldfieldtype': 'Text',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.__islocal',
+		'doctype': 'DocField',
+		'fieldname': 'cancel_reason',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 78,
+		'label': 'Cancel Reason',
+		'no_copy': 1,
+		'oldfieldname': 'cancel_reason',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'excise_page',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 79,
+		'label': 'Excise Page Number',
+		'oldfieldname': 'excise_page',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 80,
+		'label': 'Sales Team',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 81,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sales_partner',
+		'fieldtype': 'Link',
+		'idx': 82,
+		'label': 'Sales Partner',
+		'no_copy': 0,
+		'oldfieldname': 'sales_partner',
+		'oldfieldtype': 'Link',
+		'options': 'Sales Partner',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client',
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'commission_rate',
+		'fieldtype': 'Currency',
+		'idx': 83,
+		'label': 'Commission Rate (%)',
+		'no_copy': 0,
+		'oldfieldname': 'commission_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'total_commission',
+		'fieldtype': 'Currency',
+		'idx': 84,
+		'label': 'Total Commission',
+		'no_copy': 0,
+		'oldfieldname': 'total_commission',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 85,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sales_team',
+		'fieldtype': 'Table',
+		'idx': 86,
+		'label': 'Sales Team1',
+		'oldfieldname': 'sales_team',
+		'oldfieldtype': 'Table',
+		'options': 'Sales Team',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'hidden': 1,
+		'idx': 87,
+		'label': 'Supplier Details',
+		'oldfieldtype': 'Section Break',
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'supplier',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 88,
+		'label': 'Supplier',
+		'oldfieldname': 'supplier',
+		'oldfieldtype': 'Link',
+		'options': 'Supplier',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'supplier_address',
+		'fieldtype': 'Text',
+		'hidden': 1,
+		'idx': 89,
+		'label': 'Supplier Address',
+		'oldfieldname': 'supplier_address',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 0,
+		'doctype': 'DocField',
+		'fieldname': 'purchase_receipt_no',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 90,
+		'label': 'Purchase Receipt No',
+		'no_copy': 1,
+		'oldfieldname': 'purchase_receipt_no',
+		'oldfieldtype': 'Link',
+		'options': 'Purchase Receipt',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'purchase_order_no',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 91,
+		'label': 'Purchase Order',
+		'no_copy': 1,
+		'oldfieldname': 'purchase_order_no',
+		'oldfieldtype': 'Link',
+		'options': 'Purchase Order',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 92,
+		'label': 'Packing List',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'packing_details',
+		'fieldtype': 'Table',
+		'idx': 93,
+		'label': 'Packing Details',
+		'oldfieldname': 'packing_details',
+		'oldfieldtype': 'Table',
+		'options': 'Delivery Note Packing Detail',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 94,
+		'label': 'Repair Delivery Note',
+		'oldfieldtype': 'Button',
+		'options': 'repair_delivery_note',
+		'permlevel': 0,
+		'print_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/material_management/doctype/delivery_note/tests.py b/stock/doctype/delivery_note/tests.py
similarity index 100%
rename from material_management/doctype/delivery_note/tests.py
rename to stock/doctype/delivery_note/tests.py
diff --git a/payroll/doctype/earning_type/__init__.py b/stock/doctype/delivery_note_detail/__init__.py
similarity index 100%
rename from payroll/doctype/earning_type/__init__.py
rename to stock/doctype/delivery_note_detail/__init__.py
diff --git a/stock/doctype/delivery_note_detail/delivery_note_detail.txt b/stock/doctype/delivery_note_detail/delivery_note_detail.txt
new file mode 100644
index 0000000000..f5dd8bf951
--- /dev/null
+++ b/stock/doctype/delivery_note_detail/delivery_note_detail.txt
@@ -0,0 +1,489 @@
+# DocType, Delivery Note Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:58',
+		'docstatus': 0,
+		'modified': '2011-03-01 10:35:06',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'DND/.#######',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 35
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Delivery Note Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Delivery Note Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Delivery Note Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'in_filter': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client',
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'item_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Item Name',
+		'oldfieldname': 'item_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Small Text',
+		'idx': 3,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'reqd': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_uom',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'UOM',
+		'oldfieldname': 'stock_uom',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 0,
+		'reqd': 1,
+		'width': '50px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'no_of_packs',
+		'fieldtype': 'Int',
+		'idx': 5,
+		'label': 'No of Packs',
+		'oldfieldname': 'no_of_packs',
+		'oldfieldtype': 'Int',
+		'permlevel': 0,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'qty',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'label': 'Quantity',
+		'oldfieldname': 'qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'ref_rate',
+		'fieldtype': 'Currency',
+		'idx': 7,
+		'label': 'Ref Rate',
+		'no_copy': 0,
+		'oldfieldname': 'ref_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'adj_rate',
+		'fieldtype': 'Float',
+		'idx': 8,
+		'label': 'Discount (%)',
+		'oldfieldname': 'adj_rate',
+		'oldfieldtype': 'Float',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'export_rate',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'label': 'Rate',
+		'oldfieldname': 'export_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 0,
+		'trigger': 'Client',
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'export_amount',
+		'fieldtype': 'Currency',
+		'idx': 10,
+		'label': 'Amount',
+		'oldfieldname': 'export_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 0,
+		'reqd': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'base_ref_rate',
+		'fieldtype': 'Currency',
+		'idx': 11,
+		'label': 'Ref Rate*',
+		'oldfieldname': 'base_ref_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'basic_rate',
+		'fieldtype': 'Currency',
+		'idx': 12,
+		'label': 'Rate*',
+		'oldfieldname': 'basic_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0,
+		'trigger': 'Client',
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amount',
+		'fieldtype': 'Currency',
+		'idx': 13,
+		'label': 'Amount*',
+		'oldfieldname': 'amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'warehouse',
+		'fieldtype': 'Link',
+		'idx': 14,
+		'label': 'Warehouse',
+		'oldfieldname': 'warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'serial_no',
+		'fieldtype': 'Text',
+		'idx': 15,
+		'label': 'Serial No',
+		'no_copy': 1,
+		'oldfieldname': 'serial_no',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'batch_no',
+		'fieldtype': 'Link',
+		'idx': 16,
+		'label': 'Batch No',
+		'oldfieldname': 'batch_no',
+		'oldfieldtype': 'Link',
+		'options': 'Batch',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_group',
+		'fieldtype': 'Link',
+		'idx': 17,
+		'label': 'Item Group',
+		'oldfieldname': 'item_group',
+		'oldfieldtype': 'Link',
+		'options': 'Item Group',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'brand',
+		'fieldtype': 'Link',
+		'idx': 18,
+		'label': 'Brand Name',
+		'oldfieldname': 'brand',
+		'oldfieldtype': 'Link',
+		'options': 'Brand',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'pack_unit',
+		'fieldtype': 'Data',
+		'idx': 19,
+		'label': 'Pack Unit',
+		'oldfieldname': 'pack_unit',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'installed_qty',
+		'fieldtype': 'Currency',
+		'idx': 20,
+		'label': 'Installed Qty',
+		'no_copy': 1,
+		'oldfieldname': 'installed_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'actual_qty',
+		'fieldtype': 'Currency',
+		'idx': 21,
+		'label': 'Available Qty at Warehouse',
+		'no_copy': 1,
+		'oldfieldname': 'actual_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'billed_qty',
+		'fieldtype': 'Currency',
+		'idx': 22,
+		'label': 'Billed Qty',
+		'no_copy': 1,
+		'oldfieldname': 'billed_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'billed_amt',
+		'fieldtype': 'Currency',
+		'idx': 23,
+		'label': 'Billed Amt',
+		'no_copy': 1,
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_docname',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 24,
+		'in_filter': 1,
+		'label': 'Against Document No',
+		'no_copy': 1,
+		'oldfieldname': 'prevdoc_docname',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_doctype',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 25,
+		'in_filter': 1,
+		'label': 'Document Type',
+		'oldfieldname': 'prevdoc_doctype',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_date',
+		'fieldtype': 'Date',
+		'hidden': 1,
+		'idx': 26,
+		'in_filter': 1,
+		'label': 'Against Document Date',
+		'oldfieldname': 'prevdoc_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_detail_docname',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 27,
+		'in_filter': 1,
+		'label': 'Against Document Detail No',
+		'oldfieldname': 'prevdoc_detail_docname',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 0,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_tax_rate',
+		'fieldtype': 'Small Text',
+		'hidden': 1,
+		'idx': 28,
+		'label': 'Item Tax Rate',
+		'oldfieldname': 'item_tax_rate',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'page_break',
+		'fieldtype': 'Check',
+		'idx': 29,
+		'label': 'Page Break',
+		'oldfieldname': 'page_break',
+		'oldfieldtype': 'Check',
+		'permlevel': 0,
+		'print_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/educational_qualifications/__init__.py b/stock/doctype/delivery_note_packing_detail/__init__.py
similarity index 100%
rename from payroll/doctype/educational_qualifications/__init__.py
rename to stock/doctype/delivery_note_packing_detail/__init__.py
diff --git a/stock/doctype/delivery_note_packing_detail/delivery_note_packing_detail.txt b/stock/doctype/delivery_note_packing_detail/delivery_note_packing_detail.txt
new file mode 100644
index 0000000000..10fdfdaa4e
--- /dev/null
+++ b/stock/doctype/delivery_note_packing_detail/delivery_note_packing_detail.txt
@@ -0,0 +1,285 @@
+# DocType, Delivery Note Packing Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:58',
+		'docstatus': 0,
+		'modified': '2011-03-14 14:50:55',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 17
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Delivery Note Packing Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Delivery Note Packing Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Delivery Note Packing Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'parent_item',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Parent Item',
+		'oldfieldname': 'parent_item',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_name',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Item Name',
+		'oldfieldname': 'item_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'parent_detail_docname',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 4,
+		'label': 'Parent Detail docname',
+		'no_copy': 1,
+		'oldfieldname': 'parent_detail_docname',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 5,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'permlevel': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'warehouse',
+		'fieldtype': 'Link',
+		'idx': 6,
+		'label': 'Warehouse',
+		'oldfieldname': 'warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'qty',
+		'fieldtype': 'Currency',
+		'idx': 7,
+		'label': 'Qty',
+		'oldfieldname': 'qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'serial_no',
+		'fieldtype': 'Text',
+		'idx': 8,
+		'label': 'Serial No',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'actual_qty',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'label': 'Actual Qty',
+		'no_copy': 1,
+		'oldfieldname': 'actual_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'projected_qty',
+		'fieldtype': 'Currency',
+		'idx': 10,
+		'label': 'Projected Qty',
+		'no_copy': 1,
+		'oldfieldname': 'projected_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'uom',
+		'fieldtype': 'Link',
+		'idx': 11,
+		'label': 'UOM',
+		'oldfieldname': 'uom',
+		'oldfieldtype': 'Link',
+		'options': 'UOM',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'planned_qty',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 12,
+		'label': 'Planned Qty ',
+		'no_copy': 1,
+		'oldfieldname': 'planned_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'produced_qty',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 13,
+		'label': 'Produced Qty',
+		'no_copy': 1,
+		'oldfieldname': 'produced_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_doctype',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 14,
+		'label': 'Prevdoc DocType',
+		'oldfieldname': 'prevdoc_doctype',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'description': 'The date at which current entry is made in system.',
+		'doctype': 'DocField',
+		'fieldname': 'transaction_date',
+		'fieldtype': 'Date',
+		'hidden': 0,
+		'idx': 15,
+		'label': 'Sales Order Date',
+		'oldfieldname': 'transaction_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'delivery_date',
+		'fieldtype': 'Date',
+		'hidden': 0,
+		'idx': 16,
+		'label': 'Expected Delivery Date',
+		'oldfieldname': 'delivery_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'confirmation_date',
+		'fieldtype': 'Date',
+		'hidden': 1,
+		'idx': 17,
+		'label': 'Confirmed delivery date',
+		'no_copy': 1,
+		'oldfieldname': 'confirmation_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'page_break',
+		'fieldtype': 'Check',
+		'idx': 18,
+		'label': 'Page Break',
+		'oldfieldname': 'page_break',
+		'oldfieldtype': 'Check',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/educational_qualifications_detail/__init__.py b/stock/doctype/item/__init__.py
similarity index 100%
rename from payroll/doctype/educational_qualifications_detail/__init__.py
rename to stock/doctype/item/__init__.py
diff --git a/material_management/doctype/item/item.js b/stock/doctype/item/item.js
similarity index 100%
rename from material_management/doctype/item/item.js
rename to stock/doctype/item/item.js
diff --git a/material_management/doctype/item/item.py b/stock/doctype/item/item.py
similarity index 100%
rename from material_management/doctype/item/item.py
rename to stock/doctype/item/item.py
diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt
new file mode 100644
index 0000000000..a20c9687ac
--- /dev/null
+++ b/stock/doctype/item/item.txt
@@ -0,0 +1,936 @@
+# DocType, Item
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:05',
+		'docstatus': 0,
+		'modified': '2011-05-30 15:22:32',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308741898',
+		'allow_attach': 1,
+		'allow_trash': 1,
+		'autoname': 'field:item_code',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'max_attachments': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'search_fields': 'item_name,description,item_group',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': '%(item_name)s',
+		'tag_fields': 'item_group',
+		'version': 153
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Item',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'amend': 0,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Item',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'submit': 0
+	},
+
+	# DocType, Item
+	{
+		'doctype': 'DocType',
+		'name': 'Item'
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'permlevel': 0,
+		'role': 'Material User',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Material Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Material Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Material User',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Material Master Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'Material Master Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 7,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 8,
+		'permlevel': 1,
+		'role': 'System Manager',
+		'write': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Item',
+		'no_copy': 0,
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 2,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Item will be saved by this name in the data base.',
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'in_filter': 0,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_name',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Item Name',
+		'oldfieldname': 'item_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Classify your item in any one item group by clicking on the magnifying glass',
+		'doctype': 'DocField',
+		'fieldname': 'item_group',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Item Group',
+		'oldfieldname': 'item_group',
+		'oldfieldtype': 'Link',
+		'options': 'Item Group',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 6,
+		'label': 'IGHelp',
+		'oldfieldtype': 'HTML',
+		'options': 'To manage Item Group, click here',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'brand',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 7,
+		'label': 'Brand',
+		'oldfieldname': 'brand',
+		'oldfieldtype': 'Link',
+		'options': 'Brand',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 8,
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 9,
+		'in_filter': 0,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 0,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description_html',
+		'fieldtype': 'Text',
+		'idx': 10,
+		'label': 'Description HTML',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Generates HTML to include image (1st attachment) in the description',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 12,
+		'label': 'Add Image',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 13,
+		'label': 'Inventory',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Enter unit of measurement in which stock of this item is maintained in your warehouse.',
+		'doctype': 'DocField',
+		'fieldname': 'stock_uom',
+		'fieldtype': 'Link',
+		'idx': 14,
+		'label': 'Default UoM',
+		'oldfieldname': 'stock_uom',
+		'oldfieldtype': 'Link',
+		'options': 'UOM',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Yes',
+		'description': 'Select "Yes" if you are maintaining stock of this item in your Inventory.',
+		'doctype': 'DocField',
+		'fieldname': 'is_stock_item',
+		'fieldtype': 'Select',
+		'idx': 15,
+		'label': 'Is Stock Item',
+		'oldfieldname': 'is_stock_item',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'valuation_method',
+		'fieldtype': 'Select',
+		'idx': 16,
+		'label': 'Valuation Method',
+		'oldfieldname': 'valuation_method',
+		'oldfieldtype': 'Select',
+		'options': '\nFIFO\nMoving Average',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'default_warehouse',
+		'fieldtype': 'Link',
+		'idx': 17,
+		'label': 'Default Warehouse',
+		'oldfieldname': 'default_warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Percentage variation in quantity to be allowed while receiving or delivering this item.',
+		'doctype': 'DocField',
+		'fieldname': 'tolerance',
+		'fieldtype': 'Currency',
+		'idx': 18,
+		'label': 'Allowance Percent',
+		'oldfieldname': 'tolerance',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 're_order_level',
+		'fieldtype': 'Currency',
+		'idx': 19,
+		'label': 'Re-Order Level',
+		'oldfieldname': 're_order_level',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': '0.00',
+		'description': 'If stock level for this item has reached the minimum inventory level, system will prompt you to raise an Indent (Purchase Requisition).',
+		'doctype': 'DocField',
+		'fieldname': 'minimum_inventory_level',
+		'fieldtype': 'Currency',
+		'idx': 20,
+		'label': 'Minimum Inventory Level',
+		'oldfieldname': 'minimum_inventory_level',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': '0.00',
+		'description': 'You can enter the minimum quantity of this item to be ordered.',
+		'doctype': 'DocField',
+		'fieldname': 'min_order_qty',
+		'fieldtype': 'Currency',
+		'hidden': 0,
+		'idx': 21,
+		'label': 'Minimum Order Qty',
+		'oldfieldname': 'min_order_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 22,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'No',
+		'description': 'Select "Yes" if this item is used for some internal purpose in your company.',
+		'doctype': 'DocField',
+		'fieldname': 'is_asset_item',
+		'fieldtype': 'Select',
+		'idx': 23,
+		'label': 'Is Asset Item',
+		'oldfieldname': 'is_asset_item',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'No',
+		'doctype': 'DocField',
+		'fieldname': 'has_batch_no',
+		'fieldtype': 'Select',
+		'idx': 24,
+		'label': 'Has Batch No',
+		'oldfieldname': 'has_batch_no',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'No',
+		'description': 'Selecting "Yes" will give a unique identity to each entity of this item which can be viewed in the Serial No master.',
+		'doctype': 'DocField',
+		'fieldname': 'has_serial_no',
+		'fieldtype': 'Select',
+		'idx': 25,
+		'label': 'Has Serial No',
+		'oldfieldname': 'has_serial_no',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'warranty_period',
+		'fieldtype': 'Data',
+		'idx': 26,
+		'label': 'Warranty Period (in days)',
+		'oldfieldname': 'warranty_period',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'end_of_life',
+		'fieldtype': 'Date',
+		'idx': 27,
+		'label': 'End of Life',
+		'oldfieldname': 'end_of_life',
+		'oldfieldtype': 'Date',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 28,
+		'label': 'Purchase Details',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Yes',
+		'description': 'Selecting "Yes" will allow this item to appear in Purchase Order , Purchase Receipt.',
+		'doctype': 'DocField',
+		'fieldname': 'is_purchase_item',
+		'fieldtype': 'Select',
+		'idx': 29,
+		'label': 'Is Purchase Item',
+		'oldfieldname': 'is_purchase_item',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Indent when you select this item.',
+		'doctype': 'DocField',
+		'fieldname': 'lead_time_days',
+		'fieldtype': 'Int',
+		'idx': 30,
+		'label': 'Lead Time Days',
+		'no_copy': 1,
+		'oldfieldname': 'lead_time_days',
+		'oldfieldtype': 'Int',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Default Purchase Account in which cost of the item will be debited.',
+		'doctype': 'DocField',
+		'fieldname': 'purchase_account',
+		'fieldtype': 'Link',
+		'idx': 31,
+		'label': 'Default Expense Account',
+		'oldfieldname': 'purchase_account',
+		'oldfieldtype': 'Link',
+		'options': 'Account',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Default Cost Center for tracking expense for this item.',
+		'doctype': 'DocField',
+		'fieldname': 'cost_center',
+		'fieldtype': 'Link',
+		'idx': 32,
+		'label': 'Default Cost Center',
+		'oldfieldname': 'cost_center',
+		'oldfieldtype': 'Link',
+		'options': 'Cost Center',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Buying Cost will be updated from Purchase Orders and Purchase Receipts. 
The buying cost will calculated by moving average method.',
+		'doctype': 'DocField',
+		'fieldname': 'buying_cost',
+		'fieldtype': 'Currency',
+		'idx': 33,
+		'label': 'Buying Cost',
+		'no_copy': 1,
+		'oldfieldname': 'buying_cost',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'last_purchase_rate',
+		'fieldtype': 'Currency',
+		'idx': 34,
+		'label': 'Last Purchase Rate',
+		'no_copy': 1,
+		'oldfieldname': 'last_purchase_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'standard_rate',
+		'fieldtype': 'Currency',
+		'idx': 35,
+		'label': 'Standard Rate',
+		'oldfieldname': 'standard_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 36,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'uom_conversion_details',
+		'fieldtype': 'Table',
+		'idx': 37,
+		'label': 'UOM Conversion Details',
+		'oldfieldname': 'uom_conversion_details',
+		'oldfieldtype': 'Table',
+		'options': 'UOM Conversion Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 38,
+		'label': 'Sales Details',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Yes',
+		'description': 'Selecting "Yes" will allow this item to figure in Sales Order, Delivery Note',
+		'doctype': 'DocField',
+		'fieldname': 'is_sales_item',
+		'fieldtype': 'Select',
+		'idx': 39,
+		'label': 'Is Sales Item',
+		'oldfieldname': 'is_sales_item',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'No',
+		'description': 'Select "Yes" if this item represents some work like training, designing, consulting etc.',
+		'doctype': 'DocField',
+		'fieldname': 'is_service_item',
+		'fieldtype': 'Select',
+		'idx': 40,
+		'label': 'Is Service Item',
+		'oldfieldname': 'is_service_item',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'No',
+		'description': 'Select "Yes" if this item is to be sent to a customer or received from a supplier as a sample. Delivery notes and Purchase Receipts will update stock levels but there will be no invoice against this item.',
+		'doctype': 'DocField',
+		'fieldname': 'is_sample_item',
+		'fieldtype': 'Select',
+		'idx': 41,
+		'label': 'Allow Samples',
+		'oldfieldname': 'is_sample_item',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'max_discount',
+		'fieldtype': 'Currency',
+		'idx': 42,
+		'label': 'Max Discount (%)',
+		'oldfieldname': 'max_discount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'default_income_account',
+		'fieldtype': 'Link',
+		'idx': 43,
+		'label': 'Default Income Account',
+		'options': 'Account',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'default_sales_cost_center',
+		'fieldtype': 'Link',
+		'idx': 44,
+		'label': 'Cost Center',
+		'options': 'Cost Center',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sales_rate',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 45,
+		'label': 'Sales Rate',
+		'oldfieldname': 'sales_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 46,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Create a price list from Price List master and enter standard ref rates against each of them. On selection of a price list in Quotation, Sales Order or Delivery Note, corresponding ref rate will be fetched for this item.',
+		'doctype': 'DocField',
+		'fieldname': 'ref_rate_details',
+		'fieldtype': 'Table',
+		'idx': 47,
+		'label': 'Ref Rate Details',
+		'oldfieldname': 'ref_rate_details',
+		'oldfieldtype': 'Table',
+		'options': 'Ref Rate Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 48,
+		'label': 'Item Tax',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_tax',
+		'fieldtype': 'Table',
+		'idx': 49,
+		'label': 'Item Tax1',
+		'oldfieldname': 'item_tax',
+		'oldfieldtype': 'Table',
+		'options': 'Item Tax',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 50,
+		'label': 'Inspection Criteria',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'default': 'No',
+		'doctype': 'DocField',
+		'fieldname': 'inspection_required',
+		'fieldtype': 'Select',
+		'idx': 51,
+		'label': 'Inspection Required',
+		'no_copy': 0,
+		'oldfieldname': 'inspection_required',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_specification_details',
+		'fieldtype': 'Table',
+		'idx': 52,
+		'label': 'Item Specification Detail',
+		'oldfieldname': 'item_specification_details',
+		'oldfieldtype': 'Table',
+		'options': 'Item Specification Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 53,
+		'label': 'Manufacturing',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'No',
+		'description': 'Selecting "Yes" will allow you to create Bill of Material showing raw material and operational costs incurred to manufacture this item.',
+		'doctype': 'DocField',
+		'fieldname': 'is_manufactured_item',
+		'fieldtype': 'Select',
+		'idx': 54,
+		'label': 'Allow Bill of Materials',
+		'oldfieldname': 'is_manufactured_item',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'default_bom',
+		'fieldtype': 'Link',
+		'idx': 55,
+		'label': 'Default BOM',
+		'no_copy': 1,
+		'oldfieldname': 'default_bom',
+		'oldfieldtype': 'Link',
+		'options': 'Bill Of Materials',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'No',
+		'description': 'Selecting "Yes" will allow you to make a Production Order for this item.',
+		'doctype': 'DocField',
+		'fieldname': 'is_pro_applicable',
+		'fieldtype': 'Select',
+		'idx': 56,
+		'label': 'Allow Production Order',
+		'oldfieldname': 'is_pro_applicable',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'No',
+		'description': 'Select "Yes" if you supply raw materials to your supplier to manufacture this item.',
+		'doctype': 'DocField',
+		'fieldname': 'is_sub_contracted_item',
+		'fieldtype': 'Select',
+		'idx': 57,
+		'label': 'Is Sub Contracted Item',
+		'oldfieldname': 'is_sub_contracted_item',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_attachments_details',
+		'fieldtype': 'Table',
+		'idx': 58,
+		'label': 'Item Attachments Details',
+		'oldfieldname': 'item_attachments_details',
+		'oldfieldtype': 'Table',
+		'options': 'Item Attachments Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'file_list',
+		'fieldtype': 'Text',
+		'hidden': 1,
+		'idx': 59,
+		'label': 'File List',
+		'permlevel': 0,
+		'print_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/employee/__init__.py b/stock/doctype/item_specification_detail/__init__.py
similarity index 100%
rename from payroll/doctype/employee/__init__.py
rename to stock/doctype/item_specification_detail/__init__.py
diff --git a/stock/doctype/item_specification_detail/item_specification_detail.txt b/stock/doctype/item_specification_detail/item_specification_detail.txt
new file mode 100644
index 0000000000..7173b09038
--- /dev/null
+++ b/stock/doctype/item_specification_detail/item_specification_detail.txt
@@ -0,0 +1,66 @@
+# DocType, Item Specification Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:06',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'IISD/.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 1
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Data',
+		'name': '__common__',
+		'oldfieldtype': 'Data',
+		'parent': 'Item Specification Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Item Specification Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Item Specification Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'specification',
+		'idx': 1,
+		'in_filter': 0,
+		'label': 'Parameter',
+		'oldfieldname': 'specification',
+		'reqd': 1,
+		'search_index': 0,
+		'width': '200px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'value',
+		'idx': 2,
+		'label': 'Acceptance Criteria',
+		'oldfieldname': 'value'
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/employee_profile/__init__.py b/stock/doctype/item_tax/__init__.py
similarity index 100%
rename from payroll/doctype/employee_profile/__init__.py
rename to stock/doctype/item_tax/__init__.py
diff --git a/stock/doctype/item_tax/item_tax.txt b/stock/doctype/item_tax/item_tax.txt
new file mode 100644
index 0000000000..1d4adb749c
--- /dev/null
+++ b/stock/doctype/item_tax/item_tax.txt
@@ -0,0 +1,66 @@
+# DocType, Item Tax
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:06',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Item Tax',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Item Tax
+	{
+		'doctype': 'DocType',
+		'name': 'Item Tax'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tax_type',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Tax',
+		'oldfieldname': 'tax_type',
+		'oldfieldtype': 'Link',
+		'options': 'Account',
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tax_rate',
+		'fieldtype': 'Currency',
+		'idx': 2,
+		'label': 'Tax Rate',
+		'oldfieldname': 'tax_rate',
+		'oldfieldtype': 'Currency',
+		'reqd': 0
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/employment_type/__init__.py b/stock/doctype/landed_cost_detail/__init__.py
similarity index 100%
rename from payroll/doctype/employment_type/__init__.py
rename to stock/doctype/landed_cost_detail/__init__.py
diff --git a/stock/doctype/landed_cost_detail/landed_cost_detail.txt b/stock/doctype/landed_cost_detail/landed_cost_detail.txt
new file mode 100644
index 0000000000..16fadba833
--- /dev/null
+++ b/stock/doctype/landed_cost_detail/landed_cost_detail.txt
@@ -0,0 +1,77 @@
+# DocType, Landed Cost Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:06',
+		'docstatus': 0,
+		'modified': '2011-06-30 18:47:46',
+		'modified_by': 'Administrator',
+		'owner': 'wasim@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'stock',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 2
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Landed Cost Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocType, Landed Cost Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Landed Cost Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'account_head',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Account Head',
+		'oldfieldname': 'account_head',
+		'oldfieldtype': 'Link',
+		'options': 'Account'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Data',
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amount',
+		'fieldtype': 'Currency',
+		'idx': 3,
+		'label': 'Amount',
+		'oldfieldname': 'amount',
+		'oldfieldtype': 'Currency'
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/expense_type/__init__.py b/stock/doctype/landed_cost_master/__init__.py
similarity index 100%
rename from payroll/doctype/expense_type/__init__.py
rename to stock/doctype/landed_cost_master/__init__.py
diff --git a/material_management/doctype/landed_cost_master/landed_cost_master.js b/stock/doctype/landed_cost_master/landed_cost_master.js
similarity index 100%
rename from material_management/doctype/landed_cost_master/landed_cost_master.js
rename to stock/doctype/landed_cost_master/landed_cost_master.js
diff --git a/stock/doctype/landed_cost_master/landed_cost_master.txt b/stock/doctype/landed_cost_master/landed_cost_master.txt
new file mode 100644
index 0000000000..e405274e5e
--- /dev/null
+++ b/stock/doctype/landed_cost_master/landed_cost_master.txt
@@ -0,0 +1,167 @@
+# DocType, Landed Cost Master
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:07',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'field:title',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Stock',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 2
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Landed Cost Master',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Landed Cost Master',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Landed Cost Master
+	{
+		'doctype': 'DocType',
+		'name': 'Landed Cost Master'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'All'
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Purchase Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Purchase User',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 1,
+		'role': 'All'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 7,
+		'permlevel': 1,
+		'role': 'Purchase User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 8,
+		'permlevel': 1,
+		'role': 'Purchase Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'title',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Title',
+		'oldfieldname': 'title',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 3,
+		'label': 'Landed Cost Details',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'landed_cost',
+		'fieldtype': 'Table',
+		'idx': 4,
+		'label': 'Landed Cost',
+		'oldfieldname': 'landed_cost',
+		'oldfieldtype': 'Table',
+		'options': 'Landed Cost Master Detail',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/expense_voucher/__init__.py b/stock/doctype/landed_cost_master_detail/__init__.py
similarity index 100%
rename from payroll/doctype/expense_voucher/__init__.py
rename to stock/doctype/landed_cost_master_detail/__init__.py
diff --git a/stock/doctype/landed_cost_master_detail/landed_cost_master_detail.txt b/stock/doctype/landed_cost_master_detail/landed_cost_master_detail.txt
new file mode 100644
index 0000000000..bc752d9774
--- /dev/null
+++ b/stock/doctype/landed_cost_master_detail/landed_cost_master_detail.txt
@@ -0,0 +1,61 @@
+# DocType, Landed Cost Master Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:07',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 2
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Data',
+		'name': '__common__',
+		'oldfieldtype': 'Data',
+		'parent': 'Landed Cost Master Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Landed Cost Master Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Landed Cost Master Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'account_head',
+		'idx': 1,
+		'label': 'Account Head',
+		'oldfieldname': 'account_head'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'idx': 2,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'width': '300px'
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/expense_voucher_detail/__init__.py b/stock/doctype/landed_cost_wizard/__init__.py
similarity index 100%
rename from payroll/doctype/expense_voucher_detail/__init__.py
rename to stock/doctype/landed_cost_wizard/__init__.py
diff --git a/material_management/doctype/landed_cost_wizard/landed_cost_wizard.js b/stock/doctype/landed_cost_wizard/landed_cost_wizard.js
similarity index 100%
rename from material_management/doctype/landed_cost_wizard/landed_cost_wizard.js
rename to stock/doctype/landed_cost_wizard/landed_cost_wizard.js
diff --git a/material_management/doctype/landed_cost_wizard/landed_cost_wizard.py b/stock/doctype/landed_cost_wizard/landed_cost_wizard.py
similarity index 100%
rename from material_management/doctype/landed_cost_wizard/landed_cost_wizard.py
rename to stock/doctype/landed_cost_wizard/landed_cost_wizard.py
diff --git a/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt b/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt
new file mode 100644
index 0000000000..90c570aebc
--- /dev/null
+++ b/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt
@@ -0,0 +1,232 @@
+# DocType, Landed Cost Wizard
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:07',
+		'docstatus': 0,
+		'modified': '2011-06-30 18:47:46',
+		'modified_by': 'Administrator',
+		'owner': 'wasim@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 1,
+		'version': 31
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Landed Cost Wizard',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Landed Cost Wizard',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Landed Cost Wizard
+	{
+		'doctype': 'DocType',
+		'name': 'Landed Cost Wizard'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'All',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Purchase Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Purchase User',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 1,
+		'role': 'All'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 7,
+		'permlevel': 1,
+		'role': 'Purchase User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 8,
+		'permlevel': 1,
+		'role': 'Purchase Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'from_pr_date',
+		'fieldtype': 'Date',
+		'idx': 1,
+		'label': 'From PR Date',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'to_pr_date',
+		'fieldtype': 'Date',
+		'idx': 2,
+		'label': 'To PR Date',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'currency',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Currency',
+		'options': 'link:Currency',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 4,
+		'label': 'Get Purchase Receipt',
+		'options': 'get_purchase_receipts'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 5,
+		'label': 'LC PR Detail',
+		'options': 'Simple'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'lc_pr_details',
+		'fieldtype': 'Table',
+		'idx': 6,
+		'label': 'LC PR Details',
+		'options': 'LC PR Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 7,
+		'label': 'Landed Cost Detail',
+		'options': 'Simple'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'landed_cost',
+		'fieldtype': 'Link',
+		'idx': 8,
+		'label': 'Select Landed Cost Details Master',
+		'options': 'Landed Cost Master'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 9,
+		'label': 'Get Details',
+		'options': 'get_landed_cost_master_details'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'landed_cost_details',
+		'fieldtype': 'Table',
+		'idx': 10,
+		'label': 'Landed Cost Details',
+		'options': 'Landed Cost Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 11,
+		'label': 'Update PR',
+		'options': 'update_pr_lc_se'
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/experience_in_company_detail/__init__.py b/stock/doctype/lc_pr_detail/__init__.py
similarity index 100%
rename from payroll/doctype/experience_in_company_detail/__init__.py
rename to stock/doctype/lc_pr_detail/__init__.py
diff --git a/stock/doctype/lc_pr_detail/lc_pr_detail.txt b/stock/doctype/lc_pr_detail/lc_pr_detail.txt
new file mode 100644
index 0000000000..555f88ed8b
--- /dev/null
+++ b/stock/doctype/lc_pr_detail/lc_pr_detail.txt
@@ -0,0 +1,65 @@
+# DocType, LC PR Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:07',
+		'docstatus': 0,
+		'modified': '2011-06-30 18:47:22',
+		'modified_by': 'Administrator',
+		'owner': 'wasim@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'stock',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 2
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'LC PR Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, LC PR Detail
+	{
+		'doctype': 'DocType',
+		'name': 'LC PR Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'purchase_receipt_no',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Purchase Receipt No',
+		'oldfieldname': 'purchase_receipt_no',
+		'oldfieldtype': 'Link',
+		'options': 'Purchase Receipt'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'include_in_landed_cost',
+		'fieldtype': 'Check',
+		'idx': 2,
+		'label': 'Include In Landed Cost',
+		'oldfieldname': 'include_in_landed_cost',
+		'oldfieldtype': 'Check',
+		'width': '150px'
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/grade/__init__.py b/stock/doctype/purchase_receipt/__init__.py
similarity index 100%
rename from payroll/doctype/grade/__init__.py
rename to stock/doctype/purchase_receipt/__init__.py
diff --git a/material_management/doctype/purchase_receipt/purchase_receipt.js b/stock/doctype/purchase_receipt/purchase_receipt.js
similarity index 100%
rename from material_management/doctype/purchase_receipt/purchase_receipt.js
rename to stock/doctype/purchase_receipt/purchase_receipt.js
diff --git a/material_management/doctype/purchase_receipt/purchase_receipt.py b/stock/doctype/purchase_receipt/purchase_receipt.py
similarity index 100%
rename from material_management/doctype/purchase_receipt/purchase_receipt.py
rename to stock/doctype/purchase_receipt/purchase_receipt.py
diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/stock/doctype/purchase_receipt/purchase_receipt.txt
new file mode 100644
index 0000000000..9759630292
--- /dev/null
+++ b/stock/doctype/purchase_receipt/purchase_receipt.txt
@@ -0,0 +1,1262 @@
+# DocType, Purchase Receipt
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:15',
+		'docstatus': 0,
+		'modified': '2011-05-17 16:33:17',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1305630198',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Transaction',
+		'is_transaction_doc': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'read_only_onload': 1,
+		'search_fields': 'status, transaction_date, supplier',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': 'From %(supplier_name)s against %(purchase_order)s on %(transaction_date)s',
+		'version': 318
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Purchase Receipt',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Purchase Receipt',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Purchase Receipt
+	{
+		'doctype': 'DocType',
+		'name': 'Purchase Receipt'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Material Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Material Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Material User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Purchase User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'Purchase User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 7,
+		'match': 'supplier',
+		'permlevel': 0,
+		'role': 'Supplier'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 8,
+		'permlevel': 2,
+		'role': 'All',
+		'write': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Enter Basic Information about the Purchase Receipt',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Basic Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 2,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'To manage multiple series please go to Setup > Manage Series',
+		'doctype': 'DocField',
+		'fieldname': 'naming_series',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Series',
+		'no_copy': 1,
+		'oldfieldname': 'naming_series',
+		'oldfieldtype': 'Select',
+		'options': '\nGRN',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 0,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'supplier',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Supplier',
+		'oldfieldname': 'supplier',
+		'oldfieldtype': 'Link',
+		'options': 'Supplier',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client',
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'supplier_address',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'label': 'Supplier Address',
+		'options': 'Address',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_person',
+		'fieldtype': 'Link',
+		'idx': 6,
+		'label': 'Contact Person',
+		'options': 'Contact',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'supplier_name',
+		'fieldtype': 'Data',
+		'idx': 7,
+		'label': 'Name',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'address_display',
+		'fieldtype': 'Small Text',
+		'idx': 8,
+		'label': 'Address',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_display',
+		'fieldtype': 'Small Text',
+		'idx': 9,
+		'label': 'Contact',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_mobile',
+		'fieldtype': 'Text',
+		'idx': 10,
+		'label': 'Mobile No',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_email',
+		'fieldtype': 'Text',
+		'idx': 11,
+		'label': 'Contact Email',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 12,
+		'label': 'Amended From',
+		'no_copy': 1,
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'description': 'The date at which current entry is corrected in the system.',
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'hidden': 1,
+		'idx': 13,
+		'label': 'Amendment Date',
+		'no_copy': 1,
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 14,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'The date at which current entry is made in system.',
+		'doctype': 'DocField',
+		'fieldname': 'transaction_date',
+		'fieldtype': 'Date',
+		'idx': 15,
+		'in_filter': 1,
+		'label': 'Transaction Date',
+		'no_copy': 1,
+		'oldfieldname': 'transaction_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Select',
+		'idx': 16,
+		'in_filter': 1,
+		'label': 'Status',
+		'no_copy': 1,
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Select',
+		'options': '\nDraft\nSubmitted\nCancelled',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': '% of materials billed against this Purchase Receipt',
+		'doctype': 'DocField',
+		'fieldname': 'per_billed',
+		'fieldtype': 'Currency',
+		'idx': 17,
+		'label': '% Billed',
+		'no_copy': 1,
+		'oldfieldname': 'per_billed',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'bill_no',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 18,
+		'label': 'Bill No',
+		'oldfieldname': 'bill_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'bill_date',
+		'fieldtype': 'Date',
+		'hidden': 1,
+		'idx': 19,
+		'label': 'Bill Date',
+		'oldfieldname': 'bill_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'range',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 20,
+		'label': 'Range',
+		'oldfieldname': 'range',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 21,
+		'label': 'Transporter Info',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'transporter_name',
+		'fieldtype': 'Data',
+		'idx': 22,
+		'label': 'Transporter Name',
+		'oldfieldname': 'transporter_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Transporter lorry number',
+		'doctype': 'DocField',
+		'fieldname': 'lr_no',
+		'fieldtype': 'Data',
+		'idx': 23,
+		'label': 'LR No',
+		'no_copy': 1,
+		'oldfieldname': 'lr_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Date on which lorry started from supplier warehouse',
+		'doctype': 'DocField',
+		'fieldname': 'lr_date',
+		'fieldtype': 'Date',
+		'idx': 24,
+		'label': 'LR Date',
+		'no_copy': 1,
+		'oldfieldname': 'lr_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 25,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'challan_no',
+		'fieldtype': 'Data',
+		'idx': 26,
+		'label': 'Challan No',
+		'no_copy': 1,
+		'oldfieldname': 'challan_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'challan_date',
+		'fieldtype': 'Date',
+		'idx': 27,
+		'label': 'Challan Date',
+		'no_copy': 1,
+		'oldfieldname': 'challan_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 28,
+		'label': 'Items',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'You can make a purchase receipt from multiple purchase orders. Select purchase orders one by one and click on the button below.',
+		'doctype': 'DocField',
+		'fieldname': 'purchase_order_no',
+		'fieldtype': 'Link',
+		'idx': 29,
+		'label': 'Purchase Order',
+		'no_copy': 1,
+		'oldfieldname': 'purchase_order_no',
+		'oldfieldtype': 'Link',
+		'options': 'Purchase Order',
+		'permlevel': 0,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 30,
+		'label': 'Pull Purchase Order Details',
+		'oldfieldtype': 'Button',
+		'options': 'get_po_details',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': "Supplier's currency",
+		'doctype': 'DocField',
+		'fieldname': 'currency',
+		'fieldtype': 'Select',
+		'idx': 31,
+		'label': 'Currency',
+		'oldfieldname': 'currency',
+		'oldfieldtype': 'Select',
+		'options': 'link:Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': '1.00',
+		'description': "Rate at which supplier's currency is converted to your currency",
+		'doctype': 'DocField',
+		'fieldname': 'conversion_rate',
+		'fieldtype': 'Currency',
+		'idx': 32,
+		'label': 'Conversion Rate',
+		'oldfieldname': 'conversion_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 33,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Select "Yes" for sub - contracting items',
+		'doctype': 'DocField',
+		'fieldname': 'is_subcontracted',
+		'fieldtype': 'Select',
+		'idx': 34,
+		'label': 'Is Subcontracted',
+		'oldfieldname': 'is_subcontracted',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Warehouse where you are maintaining stock of rejected items',
+		'doctype': 'DocField',
+		'fieldname': 'rejected_warehouse',
+		'fieldtype': 'Link',
+		'idx': 35,
+		'label': 'Rejected Warehouse',
+		'no_copy': 1,
+		'oldfieldname': 'rejected_warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Supplier warehouse where you have issued raw materials for sub - contracting',
+		'doctype': 'DocField',
+		'fieldname': 'supplier_warehouse',
+		'fieldtype': 'Link',
+		'idx': 36,
+		'label': 'Supplier Warehouse',
+		'no_copy': 1,
+		'oldfieldname': 'supplier_warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 0,
+		'print_hide': 1,
+		'width': '50px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 37,
+		'oldfieldtype': 'Section Break',
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'purchase_receipt_details',
+		'fieldtype': 'Table',
+		'idx': 38,
+		'label': 'Purchase Receipt Details',
+		'oldfieldname': 'purchase_receipt_details',
+		'oldfieldtype': 'Table',
+		'options': 'Purchase Receipt Detail',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'net_total',
+		'fieldtype': 'Currency',
+		'idx': 39,
+		'label': 'Net Total',
+		'oldfieldname': 'net_total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 40,
+		'label': 'Re-Calculate Values',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Add / Edit taxes and other charges',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 41,
+		'label': 'Taxes',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'If you have created a standard template in Other Charges master, select one and click on the button below.',
+		'doctype': 'DocField',
+		'fieldname': 'purchase_other_charges',
+		'fieldtype': 'Link',
+		'idx': 42,
+		'label': 'Purchase Other Charges',
+		'oldfieldname': 'purchase_other_charges',
+		'oldfieldtype': 'Link',
+		'options': 'Purchase Other Charges',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 43,
+		'label': 'Get Tax Detail',
+		'oldfieldtype': 'Button',
+		'options': 'get_purchase_tax_details',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'purchase_tax_details',
+		'fieldtype': 'Table',
+		'idx': 44,
+		'label': 'Purchase Tax Details',
+		'oldfieldname': 'purchase_tax_details',
+		'oldfieldtype': 'Table',
+		'options': 'Purchase Tax Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 45,
+		'label': 'Calculate Tax',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'total_tax',
+		'fieldtype': 'Currency',
+		'idx': 46,
+		'label': 'Total Tax',
+		'oldfieldname': 'total_tax',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 47,
+		'label': 'Tax Calculation',
+		'oldfieldtype': 'HTML',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Add Terms and Conditions for the Purchase Receipt. You can also prepare a master Term Sheet and use the Template.',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 48,
+		'label': 'Terms',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tc_name',
+		'fieldtype': 'Link',
+		'idx': 49,
+		'label': 'Select Terms',
+		'oldfieldname': 'tc_name',
+		'oldfieldtype': 'Link',
+		'options': 'Term',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 50,
+		'label': 'Get Terms',
+		'oldfieldtype': 'Button',
+		'options': 'get_tc_details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 51,
+		'label': 'Terms HTML',
+		'oldfieldtype': 'HTML',
+		'options': 'You can add Terms and Notes that will be printed in the Transaction',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'terms',
+		'fieldtype': 'Text Editor',
+		'idx': 52,
+		'label': 'Terms1',
+		'oldfieldname': 'terms',
+		'oldfieldtype': 'Text Editor',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Filing in Additional Information about the Purchase Receipt will help you analyze your data better.',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 53,
+		'label': 'More Info',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Select the relevant company name if you have multiple companies',
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 54,
+		'in_filter': 1,
+		'label': 'Company',
+		'no_copy': 0,
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 55,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'The date at which current entry will get or has actually executed.',
+		'doctype': 'DocField',
+		'fieldname': 'posting_date',
+		'fieldtype': 'Date',
+		'idx': 56,
+		'in_filter': 1,
+		'label': 'Posting Date',
+		'no_copy': 1,
+		'oldfieldname': 'posting_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Time at which materials were received',
+		'doctype': 'DocField',
+		'fieldname': 'posting_time',
+		'fieldtype': 'Time',
+		'idx': 57,
+		'in_filter': 0,
+		'label': 'Posting Time',
+		'no_copy': 1,
+		'oldfieldname': 'posting_time',
+		'oldfieldtype': 'Time',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Track this Purchase Receipt against any Project',
+		'doctype': 'DocField',
+		'fieldname': 'project_name',
+		'fieldtype': 'Link',
+		'idx': 58,
+		'in_filter': 1,
+		'label': 'Project Name',
+		'oldfieldname': 'project_name',
+		'oldfieldtype': 'Link',
+		'options': 'Project',
+		'permlevel': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 59,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'hidden': 1,
+		'idx': 60,
+		'label': 'Other Details',
+		'oldfieldtype': 'HTML',
+		'options': "
Other Details
",
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0,
+		'width': '30%'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'select_print_heading',
+		'fieldtype': 'Link',
+		'idx': 61,
+		'label': 'Select Print Heading',
+		'no_copy': 1,
+		'oldfieldname': 'select_print_heading',
+		'oldfieldtype': 'Link',
+		'options': 'Print Heading',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'instructions',
+		'fieldtype': 'Small Text',
+		'idx': 62,
+		'label': 'Instructions',
+		'oldfieldname': 'instructions',
+		'oldfieldtype': 'Text',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'remarks',
+		'fieldtype': 'Small Text',
+		'idx': 63,
+		'label': 'Remarks',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.__islocal',
+		'doctype': 'DocField',
+		'fieldname': 'cancel_reason',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 64,
+		'label': 'Cancel Reason',
+		'no_copy': 1,
+		'oldfieldname': 'cancel_reason',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Detailed Breakup of the totals',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 65,
+		'label': 'Totals',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'rounded_total',
+		'fieldtype': 'Currency',
+		'idx': 66,
+		'label': 'Rounded Total',
+		'oldfieldname': 'rounded_total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'grand_total',
+		'fieldtype': 'Currency',
+		'idx': 67,
+		'label': 'Grand Total',
+		'oldfieldname': 'grand_total',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'other_charges_added',
+		'fieldtype': 'Currency',
+		'idx': 68,
+		'label': 'Other Charges Added',
+		'oldfieldname': 'other_charges_added',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'other_charges_deducted',
+		'fieldtype': 'Currency',
+		'idx': 69,
+		'label': 'Other Charges Deducted',
+		'oldfieldname': 'other_charges_deducted',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'In Words will be visible once you save the Purchase Receipt.',
+		'doctype': 'DocField',
+		'fieldname': 'in_words',
+		'fieldtype': 'Data',
+		'idx': 70,
+		'label': 'In Words',
+		'oldfieldname': 'in_words',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 71,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'net_total_import',
+		'fieldtype': 'Currency',
+		'idx': 72,
+		'label': 'Net Total (Import)',
+		'oldfieldname': 'net_total_import',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'grand_total_import',
+		'fieldtype': 'Currency',
+		'idx': 73,
+		'label': 'Grand Total (Import)',
+		'oldfieldname': 'grand_total_import',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'other_charges_added_import',
+		'fieldtype': 'Currency',
+		'idx': 74,
+		'label': 'Other Charges Added (Import)',
+		'oldfieldname': 'other_charges_added_import',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'other_charges_deducted_import',
+		'fieldtype': 'Currency',
+		'idx': 75,
+		'label': 'Other Charges Deducted (Import)',
+		'oldfieldname': 'other_charges_deducted_import',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'In Words (Import) will be visible once you save the Purchase Receipt.',
+		'doctype': 'DocField',
+		'fieldname': 'in_words_import',
+		'fieldtype': 'Data',
+		'idx': 76,
+		'label': 'In Words (Import)',
+		'oldfieldname': 'in_words_import',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Following table will show values if items are sub - contracted. These values will be fetched from the master of "Bill of Materials" of sub - contracted items.',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 77,
+		'label': 'Raw Material Details',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 78,
+		'label': 'Get Current Stock',
+		'oldfieldtype': 'Button',
+		'options': 'get_current_stock',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'pr_raw_material_details',
+		'fieldtype': 'Table',
+		'idx': 79,
+		'label': 'PR Raw Material Details',
+		'no_copy': 1,
+		'oldfieldname': 'pr_raw_material_details',
+		'oldfieldtype': 'Table',
+		'options': 'PR Raw Material Detail',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 80,
+		'label': 'Repair Purchase Receipt',
+		'oldfieldtype': 'Button',
+		'options': 'repair_purchase_receipt',
+		'permlevel': 0,
+		'print_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/holiday_list/__init__.py b/stock/doctype/purchase_receipt_detail/__init__.py
similarity index 100%
rename from payroll/doctype/holiday_list/__init__.py
rename to stock/doctype/purchase_receipt_detail/__init__.py
diff --git a/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt b/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
new file mode 100644
index 0000000000..d030b9e4b7
--- /dev/null
+++ b/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
@@ -0,0 +1,563 @@
+# DocType, Purchase Receipt Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:16',
+		'docstatus': 0,
+		'modified': '2011-03-16 17:12:38',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'GRND/.#######',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 61
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Purchase Receipt Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Purchase Receipt Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Purchase Receipt Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'in_filter': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'in_filter': 0,
+		'label': 'Item Name',
+		'oldfieldname': 'item_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 3,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'reqd': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'uom',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'label': 'UOM',
+		'oldfieldname': 'uom',
+		'oldfieldtype': 'Link',
+		'options': 'UOM',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'received_qty',
+		'fieldtype': 'Currency',
+		'idx': 5,
+		'label': 'Recd Quantity',
+		'oldfieldname': 'received_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'qty',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'label': 'Accepted Quantity',
+		'oldfieldname': 'qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'rejected_qty',
+		'fieldtype': 'Currency',
+		'idx': 7,
+		'in_filter': 0,
+		'label': 'Rejected Quantity',
+		'oldfieldname': 'rejected_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'search_index': 0,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'purchase_rate',
+		'fieldtype': 'Currency',
+		'idx': 8,
+		'label': 'Rate (Default Curr.)',
+		'oldfieldname': 'purchase_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'amount',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'label': 'Amount (Default Curr.)',
+		'oldfieldname': 'amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'schedule_date',
+		'fieldtype': 'Date',
+		'idx': 10,
+		'label': 'Schedule date',
+		'no_copy': 1,
+		'oldfieldname': 'schedule_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'warehouse',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 11,
+		'label': 'Accepted Warehouse',
+		'oldfieldname': 'warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 0,
+		'print_hide': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'import_rate',
+		'fieldtype': 'Currency',
+		'idx': 12,
+		'label': 'Rate',
+		'oldfieldname': 'import_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 0,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'import_amount',
+		'fieldtype': 'Currency',
+		'idx': 13,
+		'label': 'Amount',
+		'oldfieldname': 'import_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'conversion_factor',
+		'fieldtype': 'Currency',
+		'idx': 14,
+		'label': 'Conversion Factor',
+		'oldfieldname': 'conversion_factor',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_uom',
+		'fieldtype': 'Data',
+		'idx': 15,
+		'label': 'Stock UOM',
+		'oldfieldname': 'stock_uom',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_qty',
+		'fieldtype': 'Currency',
+		'idx': 16,
+		'label': 'Stock Qty',
+		'oldfieldname': 'stock_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client',
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'serial_no',
+		'fieldtype': 'Text',
+		'idx': 17,
+		'label': 'Serial No',
+		'no_copy': 1,
+		'oldfieldname': 'serial_no',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'batch_no',
+		'fieldtype': 'Link',
+		'idx': 18,
+		'label': 'Batch No',
+		'oldfieldname': 'batch_no',
+		'oldfieldtype': 'Link',
+		'options': 'Batch',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'rejected_warehouse',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 19,
+		'label': 'Rejected Warehouse',
+		'no_copy': 1,
+		'oldfieldname': 'rejected_warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'qa_no',
+		'fieldtype': 'Link',
+		'idx': 20,
+		'label': 'QA No',
+		'no_copy': 1,
+		'oldfieldname': 'qa_no',
+		'oldfieldtype': 'Link',
+		'options': 'QA Inspection Report',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'brand',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 21,
+		'label': 'Brand',
+		'oldfieldname': 'brand',
+		'oldfieldtype': 'Link',
+		'options': 'Brand',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_group',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 22,
+		'in_filter': 1,
+		'label': 'Item Group',
+		'oldfieldname': 'item_group',
+		'oldfieldtype': 'Link',
+		'options': 'Item Group',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_doctype',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 23,
+		'label': 'Prevdoc Doctype',
+		'oldfieldname': 'prevdoc_doctype',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_docname',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 24,
+		'in_filter': 1,
+		'label': 'PO No',
+		'no_copy': 0,
+		'oldfieldname': 'prevdoc_docname',
+		'oldfieldtype': 'Link',
+		'options': 'Purchase Order',
+		'permlevel': 1,
+		'print_hide': 0,
+		'reqd': 0,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_date',
+		'fieldtype': 'Date',
+		'hidden': 1,
+		'idx': 25,
+		'in_filter': 1,
+		'label': 'PO Date',
+		'oldfieldname': 'prevdoc_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rm_supp_cost',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 26,
+		'in_filter': 0,
+		'label': 'Raw Materials Supplied Cost',
+		'oldfieldname': 'rm_supp_cost',
+		'oldfieldtype': 'Currency',
+		'permlevel': 2,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_tax_amount',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 27,
+		'label': 'Item Tax Amount',
+		'no_copy': 1,
+		'oldfieldname': 'item_tax_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_detail_docname',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 28,
+		'in_filter': 1,
+		'label': 'PO Detail No',
+		'no_copy': 0,
+		'oldfieldname': 'prevdoc_detail_docname',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'default': '0.00',
+		'doctype': 'DocField',
+		'fieldname': 'billed_qty',
+		'fieldtype': 'Currency',
+		'idx': 29,
+		'label': 'Billed Quantity',
+		'no_copy': 1,
+		'oldfieldname': 'billed_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'valuation_rate',
+		'fieldtype': 'Currency',
+		'hidden': 0,
+		'idx': 30,
+		'in_filter': 0,
+		'label': 'Valuation Rate',
+		'no_copy': 1,
+		'oldfieldname': 'valuation_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'width': '80px'
+	},
+
+	# DocField
+	{
+		'description': 'Tax detail table fetched from item master as a string and stored in this field.\nUsed for Purchase Other Charges',
+		'doctype': 'DocField',
+		'fieldname': 'item_tax_rate',
+		'fieldtype': 'Small Text',
+		'hidden': 1,
+		'idx': 31,
+		'in_filter': 0,
+		'label': 'Item Tax Rate',
+		'oldfieldname': 'item_tax_rate',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'doctype': 'DocField',
+		'fieldname': 'page_break',
+		'fieldtype': 'Check',
+		'idx': 32,
+		'label': 'Page Break',
+		'oldfieldname': 'page_break',
+		'oldfieldtype': 'Check',
+		'permlevel': 0,
+		'print_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/holiday_list_detail/__init__.py b/stock/doctype/ref_rate_detail/__init__.py
similarity index 100%
rename from payroll/doctype/holiday_list_detail/__init__.py
rename to stock/doctype/ref_rate_detail/__init__.py
diff --git a/stock/doctype/ref_rate_detail/ref_rate_detail.txt b/stock/doctype/ref_rate_detail/ref_rate_detail.txt
new file mode 100644
index 0000000000..078fadc75d
--- /dev/null
+++ b/stock/doctype/ref_rate_detail/ref_rate_detail.txt
@@ -0,0 +1,84 @@
+# DocType, Ref Rate Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:19',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'RFD/.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 1,
+		'istable': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'read_only': 0,
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 2
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'in_filter': 1,
+		'name': '__common__',
+		'parent': 'Ref Rate Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'search_index': 1
+	},
+
+	# DocType, Ref Rate Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Ref Rate Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'price_list_name',
+		'fieldtype': 'Select',
+		'idx': 1,
+		'label': 'Price List Name',
+		'oldfieldname': 'price_list_name',
+		'oldfieldtype': 'Select',
+		'options': 'link:Price List',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'ref_rate',
+		'fieldtype': 'Currency',
+		'idx': 2,
+		'label': 'Ref Rate',
+		'oldfieldname': 'ref_rate',
+		'oldfieldtype': 'Currency',
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'ref_currency',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Currency',
+		'oldfieldname': 'ref_currency',
+		'oldfieldtype': 'Select',
+		'options': 'link:Currency',
+		'reqd': 1
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/invest_80_declaration_detail/__init__.py b/stock/doctype/sales_and_purchase_return_wizard/__init__.py
similarity index 100%
rename from payroll/doctype/invest_80_declaration_detail/__init__.py
rename to stock/doctype/sales_and_purchase_return_wizard/__init__.py
diff --git a/material_management/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.js b/stock/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.js
similarity index 100%
rename from material_management/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.js
rename to stock/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.js
diff --git a/material_management/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.py b/stock/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.py
similarity index 100%
rename from material_management/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.py
rename to stock/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.py
diff --git a/stock/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.txt b/stock/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.txt
new file mode 100644
index 0000000000..bc6d6fa06a
--- /dev/null
+++ b/stock/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.txt
@@ -0,0 +1,443 @@
+# DocType, Sales and Purchase Return Wizard
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:21',
+		'docstatus': 0,
+		'modified': '2011-02-23 19:09:18',
+		'modified_by': 'Administrator',
+		'owner': 'wasim@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'is_transaction_doc': 0,
+		'issingle': 1,
+		'istable': 0,
+		'menu_index': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'parent_node': 'Materials',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 1,
+		'version': 46
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Sales and Purchase Return Wizard',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Sales and Purchase Return Wizard',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Sales and Purchase Return Wizard
+	{
+		'doctype': 'DocType',
+		'name': 'Sales and Purchase Return Wizard'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'Material Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'Material Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'All',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 7,
+		'permlevel': 0,
+		'role': 'Accounts Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 8,
+		'permlevel': 0,
+		'role': 'Accounts User',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 9,
+		'permlevel': 0,
+		'role': 'Sales User',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 10,
+		'permlevel': 0,
+		'role': 'Sales Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 11,
+		'permlevel': 0,
+		'role': 'Purchase User',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 12,
+		'permlevel': 0,
+		'role': 'Purchase Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 13,
+		'permlevel': 1,
+		'role': 'All'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 14,
+		'permlevel': 1,
+		'role': 'System Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 15,
+		'permlevel': 1,
+		'role': 'Accounts Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 16,
+		'permlevel': 1,
+		'role': 'Accounts User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 17,
+		'permlevel': 1,
+		'role': 'Sales User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 18,
+		'permlevel': 1,
+		'role': 'Sales Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 19,
+		'permlevel': 1,
+		'role': 'Purchase User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 20,
+		'permlevel': 1,
+		'role': 'Purchase Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'return_date',
+		'fieldtype': 'Date',
+		'idx': 1,
+		'label': 'Return Date',
+		'no_copy': 1,
+		'oldfieldname': 'return_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'return_type',
+		'fieldtype': 'Select',
+		'idx': 2,
+		'label': 'Return Type',
+		'no_copy': 1,
+		'oldfieldname': 'return_type',
+		'oldfieldtype': 'Select',
+		'options': '\nSales Return\nPurchase Return',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'delivery_note_no',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 3,
+		'label': 'Delivery Note No',
+		'no_copy': 1,
+		'oldfieldname': 'delivery_note_no',
+		'oldfieldtype': 'Link',
+		'options': 'Delivery Note',
+		'permlevel': 0,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sales_invoice_no',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 4,
+		'label': 'Sales Invoice No',
+		'options': 'Receivable Voucher',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'purchase_receipt_no',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 5,
+		'label': 'Purchase Receipt No',
+		'no_copy': 1,
+		'oldfieldname': 'purchase_receipt_no',
+		'oldfieldtype': 'Link',
+		'options': 'Purchase Receipt',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'cust_supp',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 6,
+		'label': 'Customer/Supplier',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'cust_supp_name',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 7,
+		'label': 'Cust/Supp Name',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'cust_supp_address',
+		'fieldtype': 'Small Text',
+		'hidden': 1,
+		'idx': 8,
+		'label': 'Cust/Supp Address',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'hidden': 1,
+		'idx': 9,
+		'label': 'Get Items',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'return_details',
+		'fieldtype': 'Table',
+		'hidden': 1,
+		'idx': 10,
+		'label': 'Return Details',
+		'no_copy': 1,
+		'oldfieldname': 'return_details',
+		'oldfieldtype': 'Table',
+		'options': 'Return Detail',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'hidden': 1,
+		'idx': 11,
+		'label': 'Make Stock Entry',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'hidden': 1,
+		'idx': 12,
+		'label': 'Make Excise Invoice',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'hidden': 1,
+		'idx': 13,
+		'label': 'Make Credit Note',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'hidden': 1,
+		'idx': 14,
+		'label': 'Make Debit Note',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/it_checklist/__init__.py b/stock/doctype/sales_bom/__init__.py
similarity index 100%
rename from payroll/doctype/it_checklist/__init__.py
rename to stock/doctype/sales_bom/__init__.py
diff --git a/material_management/doctype/sales_bom/sales_bom.js b/stock/doctype/sales_bom/sales_bom.js
similarity index 100%
rename from material_management/doctype/sales_bom/sales_bom.js
rename to stock/doctype/sales_bom/sales_bom.js
diff --git a/material_management/doctype/sales_bom/sales_bom.py b/stock/doctype/sales_bom/sales_bom.py
similarity index 100%
rename from material_management/doctype/sales_bom/sales_bom.py
rename to stock/doctype/sales_bom/sales_bom.py
diff --git a/stock/doctype/sales_bom/sales_bom.txt b/stock/doctype/sales_bom/sales_bom.txt
new file mode 100644
index 0000000000..8863eb2d34
--- /dev/null
+++ b/stock/doctype/sales_bom/sales_bom.txt
@@ -0,0 +1,273 @@
+# DocType, Sales BOM
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:21',
+		'docstatus': 0,
+		'modified': '2010-12-23 11:43:34',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'allow_trash': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Stock',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 37
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Sales BOM',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Sales BOM',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Sales BOM
+	{
+		'doctype': 'DocType',
+		'name': 'Sales BOM'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Material Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Material Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Sales User',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'Sales User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'new_item_code',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'New Item Code',
+		'no_copy': 1,
+		'oldfieldname': 'new_item_code',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'new_item_name',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'New Item Name',
+		'oldfieldname': 'new_item_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'new_item_brand',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'New Item Brand',
+		'oldfieldname': 'new_item_brand',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 5,
+		'label': 'New Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'permlevel': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_group',
+		'fieldtype': 'Link',
+		'idx': 7,
+		'label': 'Item Group',
+		'oldfieldname': 'item_group',
+		'oldfieldtype': 'Link',
+		'options': 'Item Group',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'price_list',
+		'fieldtype': 'Select',
+		'idx': 8,
+		'label': 'Price List',
+		'oldfieldname': 'price_list',
+		'oldfieldtype': 'Select',
+		'options': 'link:Price List',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'currency',
+		'fieldtype': 'Select',
+		'idx': 9,
+		'label': 'Currency',
+		'oldfieldname': 'currency',
+		'oldfieldtype': 'Select',
+		'options': 'link:Currency',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 10,
+		'label': 'Find Sales BOM',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sales_bom_items',
+		'fieldtype': 'Table',
+		'idx': 11,
+		'label': 'Sales BOM Items',
+		'oldfieldname': 'sales_bom_items',
+		'oldfieldtype': 'Table',
+		'options': 'Sales BOM Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_uom',
+		'fieldtype': 'Link',
+		'idx': 12,
+		'label': 'Stock UOM',
+		'oldfieldname': 'stock_uom',
+		'oldfieldtype': 'Link',
+		'options': 'UOM',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/kra_sheet/__init__.py b/stock/doctype/sales_bom_detail/__init__.py
similarity index 100%
rename from payroll/doctype/kra_sheet/__init__.py
rename to stock/doctype/sales_bom_detail/__init__.py
diff --git a/stock/doctype/sales_bom_detail/sales_bom_detail.txt b/stock/doctype/sales_bom_detail/sales_bom_detail.txt
new file mode 100644
index 0000000000..31d2f1a47e
--- /dev/null
+++ b/stock/doctype/sales_bom_detail/sales_bom_detail.txt
@@ -0,0 +1,119 @@
+# DocType, Sales BOM Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:21',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 3
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Sales BOM Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Sales BOM Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Sales BOM Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_main_item',
+		'fieldtype': 'Select',
+		'idx': 1,
+		'label': 'Is Main Item',
+		'oldfieldname': 'is_main_item',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 2,
+		'label': 'Item',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 3,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'rate',
+		'fieldtype': 'Currency',
+		'idx': 6,
+		'label': 'Rate',
+		'oldfieldname': 'rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'qty',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'label': 'Qty',
+		'oldfieldname': 'qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'uom',
+		'fieldtype': 'Link',
+		'idx': 10,
+		'label': 'UOM',
+		'oldfieldname': 'uom',
+		'oldfieldtype': 'Link',
+		'options': 'UOM',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/kra_template/__init__.py b/stock/doctype/serial_no/__init__.py
similarity index 100%
rename from payroll/doctype/kra_template/__init__.py
rename to stock/doctype/serial_no/__init__.py
diff --git a/material_management/doctype/serial_no/serial_no.js b/stock/doctype/serial_no/serial_no.js
similarity index 100%
rename from material_management/doctype/serial_no/serial_no.js
rename to stock/doctype/serial_no/serial_no.js
diff --git a/material_management/doctype/serial_no/serial_no.py b/stock/doctype/serial_no/serial_no.py
similarity index 100%
rename from material_management/doctype/serial_no/serial_no.py
rename to stock/doctype/serial_no/serial_no.py
diff --git a/stock/doctype/serial_no/serial_no.txt b/stock/doctype/serial_no/serial_no.txt
new file mode 100644
index 0000000000..dd250ee7bd
--- /dev/null
+++ b/stock/doctype/serial_no/serial_no.txt
@@ -0,0 +1,746 @@
+# DocType, Serial No
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:23',
+		'docstatus': 0,
+		'modified': '2011-05-17 12:38:15',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1305616095',
+		'allow_trash': 1,
+		'autoname': 'field:serial_no',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Stock',
+		'name': '__common__',
+		'search_fields': 'item_code,status',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': '%(item_code)s',
+		'tag_fields': 'status',
+		'version': 188
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Serial No',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Serial No',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Serial No
+	{
+		'doctype': 'DocType',
+		'name': 'Serial No'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 1,
+		'role': 'Material Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Material Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 0,
+		'role': 'Material Master Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 7,
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 8,
+		'permlevel': 1,
+		'role': 'Sales Master Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Details',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 2,
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'default': 'In Store',
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Status',
+		'no_copy': 1,
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Select',
+		'options': '\nIn Store\nDelivered\nNot in Use',
+		'permlevel': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'serial_no',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'in_filter': 0,
+		'label': 'Serial No',
+		'no_copy': 1,
+		'oldfieldname': 'serial_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 6,
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_name',
+		'fieldtype': 'Data',
+		'idx': 7,
+		'label': 'Item Name',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'permlevel': 1,
+		'reqd': 1,
+		'search_index': 0,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_group',
+		'fieldtype': 'Link',
+		'idx': 9,
+		'in_filter': 0,
+		'label': 'Item Group',
+		'oldfieldname': 'item_group',
+		'oldfieldtype': 'Link',
+		'options': 'Item Group',
+		'permlevel': 1,
+		'reqd': 0,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'brand',
+		'fieldtype': 'Link',
+		'idx': 10,
+		'in_filter': 0,
+		'label': 'Brand',
+		'oldfieldname': 'brand',
+		'oldfieldtype': 'Link',
+		'options': 'Brand',
+		'permlevel': 1,
+		'reqd': 0,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 11,
+		'label': 'Purchase Details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 12,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'purchase_document_type',
+		'fieldtype': 'Select',
+		'idx': 13,
+		'label': 'Purchase Document Type',
+		'no_copy': 1,
+		'options': '\nPurchase Receipt\nStock Entry',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'purchase_document_no',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 14,
+		'label': 'Purchase Document No',
+		'no_copy': 1,
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'purchase_date',
+		'fieldtype': 'Date',
+		'idx': 15,
+		'in_filter': 1,
+		'label': 'Purchase Date',
+		'no_copy': 1,
+		'oldfieldname': 'purchase_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 0,
+		'search_index': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'purchase_time',
+		'fieldtype': 'Time',
+		'idx': 16,
+		'label': 'Incoming Time',
+		'no_copy': 1,
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'purchase_rate',
+		'fieldtype': 'Currency',
+		'idx': 17,
+		'in_filter': 0,
+		'label': 'Incoming Rate',
+		'no_copy': 1,
+		'oldfieldname': 'purchase_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 18,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'warehouse',
+		'fieldtype': 'Link',
+		'idx': 19,
+		'in_filter': 1,
+		'label': 'Warehouse',
+		'no_copy': 1,
+		'oldfieldname': 'warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 0,
+		'reqd': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'supplier',
+		'fieldtype': 'Link',
+		'idx': 20,
+		'in_filter': 1,
+		'label': 'Supplier',
+		'no_copy': 1,
+		'options': 'Supplier',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'supplier_name',
+		'fieldtype': 'Data',
+		'idx': 21,
+		'in_filter': 1,
+		'label': 'Supplier Name',
+		'no_copy': 1,
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'address_display',
+		'fieldtype': 'Text',
+		'idx': 22,
+		'label': 'Supplier Address',
+		'no_copy': 1,
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 23,
+		'label': 'Delivery Details',
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 24,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'delivery_document_type',
+		'fieldtype': 'Select',
+		'idx': 25,
+		'in_filter': 1,
+		'label': 'Delivery Document Type',
+		'no_copy': 1,
+		'options': '\nDelivery Note\nReceivable Voucher\nStock Entry',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'delivery_document_no',
+		'fieldtype': 'Data',
+		'idx': 26,
+		'in_filter': 1,
+		'label': 'Delivery Document No',
+		'no_copy': 1,
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_address',
+		'fieldtype': 'Text',
+		'idx': 27,
+		'label': 'Customer Address',
+		'oldfieldname': 'customer_address',
+		'oldfieldtype': 'Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'delivery_date',
+		'fieldtype': 'Date',
+		'idx': 28,
+		'label': 'Delivery Date',
+		'no_copy': 1,
+		'oldfieldname': 'delivery_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'delivery_time',
+		'fieldtype': 'Time',
+		'idx': 29,
+		'label': 'Delivery Time',
+		'no_copy': 1,
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_cancelled',
+		'fieldtype': 'Select',
+		'hidden': 1,
+		'idx': 30,
+		'label': 'Is Cancelled',
+		'oldfieldname': 'is_cancelled',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 31,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer',
+		'fieldtype': 'Link',
+		'idx': 32,
+		'in_filter': 1,
+		'label': 'Customer',
+		'no_copy': 1,
+		'oldfieldname': 'customer',
+		'oldfieldtype': 'Link',
+		'options': 'Customer',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'customer_name',
+		'fieldtype': 'Data',
+		'idx': 33,
+		'in_filter': 1,
+		'label': 'Customer Name',
+		'no_copy': 1,
+		'oldfieldname': 'customer_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'delivery_address',
+		'fieldtype': 'Text',
+		'idx': 34,
+		'label': 'Delivery Address',
+		'no_copy': 1,
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'territory',
+		'fieldtype': 'Link',
+		'idx': 35,
+		'in_filter': 1,
+		'label': 'Territory',
+		'no_copy': 1,
+		'oldfieldname': 'territory',
+		'oldfieldtype': 'Link',
+		'options': 'Territory',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 36,
+		'label': 'Warranty / AMC Details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 37,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'maintenance_status',
+		'fieldtype': 'Select',
+		'idx': 38,
+		'in_filter': 1,
+		'label': 'Maintenance Status',
+		'no_copy': 0,
+		'oldfieldname': 'maintenance_status',
+		'oldfieldtype': 'Select',
+		'options': '\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC',
+		'permlevel': 0,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'warranty_period',
+		'fieldtype': 'Int',
+		'idx': 39,
+		'label': 'Warranty Period (Days)',
+		'oldfieldname': 'warranty_period',
+		'oldfieldtype': 'Int',
+		'permlevel': 0,
+		'trigger': 'Client',
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 40,
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'warranty_expiry_date',
+		'fieldtype': 'Date',
+		'idx': 41,
+		'in_filter': 1,
+		'label': 'Warranty Expiry Date',
+		'oldfieldname': 'warranty_expiry_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amc_expiry_date',
+		'fieldtype': 'Date',
+		'idx': 42,
+		'in_filter': 1,
+		'label': 'AMC Expiry Date',
+		'oldfieldname': 'amc_expiry_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'search_index': 0,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 43,
+		'label': 'More Info',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'serial_no_details',
+		'fieldtype': 'Text Editor',
+		'idx': 44,
+		'label': 'Serial No Details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Select',
+		'idx': 45,
+		'in_filter': 1,
+		'label': 'Company',
+		'options': 'link:Company',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 46,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 47,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/leave_allocation/__init__.py b/stock/doctype/stock_entry/__init__.py
old mode 100755
new mode 100644
similarity index 100%
rename from payroll/doctype/leave_allocation/__init__.py
rename to stock/doctype/stock_entry/__init__.py
diff --git a/material_management/doctype/stock_entry/stock_entry.js b/stock/doctype/stock_entry/stock_entry.js
similarity index 100%
rename from material_management/doctype/stock_entry/stock_entry.js
rename to stock/doctype/stock_entry/stock_entry.js
diff --git a/material_management/doctype/stock_entry/stock_entry.py b/stock/doctype/stock_entry/stock_entry.py
similarity index 100%
rename from material_management/doctype/stock_entry/stock_entry.py
rename to stock/doctype/stock_entry/stock_entry.py
diff --git a/material_management/doctype/stock_entry/stock_entry.py~ b/stock/doctype/stock_entry/stock_entry.py~
similarity index 100%
rename from material_management/doctype/stock_entry/stock_entry.py~
rename to stock/doctype/stock_entry/stock_entry.py~
diff --git a/stock/doctype/stock_entry/stock_entry.txt b/stock/doctype/stock_entry/stock_entry.txt
new file mode 100644
index 0000000000..6959d4d8e3
--- /dev/null
+++ b/stock/doctype/stock_entry/stock_entry.txt
@@ -0,0 +1,779 @@
+# DocType, Stock Entry
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:25',
+		'docstatus': 0,
+		'modified': '2011-06-14 12:50:12',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308741898',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'Stock',
+		'name': '__common__',
+		'print_outline': 'No',
+		'search_fields': 'transfer_date, from_warehouse, to_warehouse, purpose, remarks',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': '%(remarks)s',
+		'tag_fields': 'purpose',
+		'version': 243
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Stock Entry',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Stock Entry',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Stock Entry
+	{
+		'doctype': 'DocType',
+		'name': 'Stock Entry'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'Material Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'Material Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'Material User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Production User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'Production User'
+	},
+
+	# DocPerm
+	{
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 7,
+		'permlevel': 2,
+		'role': 'Production User',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 8,
+		'permlevel': 0,
+		'role': 'Production Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 9,
+		'permlevel': 1,
+		'role': 'Production Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 10,
+		'permlevel': 2,
+		'role': 'Production Manager',
+		'write': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Warehouse',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 2,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'To manage multiple series please go to Setup > Manage Series',
+		'doctype': 'DocField',
+		'fieldname': 'naming_series',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'label': 'Series',
+		'no_copy': 1,
+		'oldfieldname': 'naming_series',
+		'oldfieldtype': 'Select',
+		'options': 'STE',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'description': 'The date at which current entry is corrected in the system.',
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'idx': 4,
+		'label': 'Amendment Date',
+		'no_copy': 1,
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'purpose',
+		'fieldtype': 'Select',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Purpose',
+		'oldfieldname': 'purpose',
+		'oldfieldtype': 'Select',
+		'options': 'Material Issue\nMaterial Receipt\nMaterial Transfer\nSales Return\nPurchase Return\nSubcontracting\nProduction Order',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'delivery_note_no',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 6,
+		'label': 'Delivery Note No',
+		'oldfieldname': 'delivery_note_no',
+		'oldfieldtype': 'Link',
+		'options': 'Delivery Note',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'purchase_receipt_no',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 7,
+		'label': 'Purchase Receipt No',
+		'oldfieldname': 'purchase_receipt_no',
+		'oldfieldtype': 'Link',
+		'options': 'Purchase Receipt',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sales_invoice_no',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 8,
+		'label': 'Sales Invoice No',
+		'options': 'Receivable Voucher',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'supplier',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 9,
+		'label': 'Supplier',
+		'oldfieldname': 'supplier',
+		'oldfieldtype': 'Link',
+		'options': 'Supplier',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'supplier_name',
+		'fieldtype': 'Data',
+		'idx': 10,
+		'label': 'Supplier Name',
+		'oldfieldname': 'supplier_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'supplier_address',
+		'fieldtype': 'Small Text',
+		'hidden': 1,
+		'idx': 11,
+		'label': 'Supplier Address',
+		'oldfieldname': 'supplier_address',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'customer',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 12,
+		'label': 'Customer',
+		'oldfieldname': 'customer',
+		'oldfieldtype': 'Link',
+		'options': 'Customer',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_name',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 13,
+		'label': 'Customer Name',
+		'oldfieldname': 'customer_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_address',
+		'fieldtype': 'Small Text',
+		'hidden': 1,
+		'idx': 14,
+		'label': 'Customer Address',
+		'oldfieldname': 'customer_address',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'process',
+		'fieldtype': 'Select',
+		'hidden': 1,
+		'idx': 15,
+		'in_filter': 1,
+		'label': 'Process',
+		'oldfieldname': 'process',
+		'oldfieldtype': 'Select',
+		'options': '\nMaterial Transfer\nBackflush',
+		'permlevel': 2,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'production_order',
+		'fieldtype': 'Link',
+		'hidden': 1,
+		'idx': 16,
+		'in_filter': 1,
+		'label': 'Production Order',
+		'oldfieldname': 'production_order',
+		'oldfieldtype': 'Link',
+		'options': 'Production Order',
+		'permlevel': 2,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fg_completed_qty',
+		'fieldtype': 'Currency',
+		'idx': 17,
+		'label': 'FG Completed Qty',
+		'oldfieldname': 'fg_completed_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 2,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 18,
+		'label': 'Warehouse HTML',
+		'no_copy': 0,
+		'oldfieldtype': 'HTML',
+		'options': "
Warehouse
",
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'from_warehouse',
+		'fieldtype': 'Link',
+		'idx': 19,
+		'label': 'Source Warehouse',
+		'oldfieldname': 'from_warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Notes: Either Source or Target is Mandatory',
+		'doctype': 'DocField',
+		'fieldname': 'to_warehouse',
+		'fieldtype': 'Link',
+		'idx': 20,
+		'in_filter': 0,
+		'label': 'Target Warehouse',
+		'oldfieldname': 'to_warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 21,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'default': 'Today',
+		'doctype': 'DocField',
+		'fieldname': 'transfer_date',
+		'fieldtype': 'Date',
+		'idx': 22,
+		'in_filter': 1,
+		'label': 'Transfer Date',
+		'no_copy': 1,
+		'oldfieldname': 'transfer_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'description': 'The date at which current entry will get or has actually executed.',
+		'doctype': 'DocField',
+		'fieldname': 'posting_date',
+		'fieldtype': 'Date',
+		'idx': 23,
+		'in_filter': 1,
+		'label': 'Posting Date',
+		'no_copy': 1,
+		'oldfieldname': 'posting_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'posting_time',
+		'fieldtype': 'Time',
+		'idx': 24,
+		'in_filter': 0,
+		'label': 'Posting Time',
+		'no_copy': 1,
+		'oldfieldname': 'posting_time',
+		'oldfieldtype': 'Time',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Link',
+		'idx': 25,
+		'label': 'Amended From',
+		'no_copy': 1,
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Link',
+		'options': 'Stock Entry',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'transporter',
+		'fieldtype': 'Data',
+		'idx': 26,
+		'label': 'Transporter',
+		'oldfieldname': 'transporter',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_excisable_goods',
+		'fieldtype': 'Select',
+		'idx': 27,
+		'label': 'Is Excisable Goods',
+		'oldfieldname': 'is_excisable_goods',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'excisable_goods',
+		'fieldtype': 'Select',
+		'idx': 28,
+		'label': 'Excisable Goods',
+		'oldfieldname': 'excisable_goods',
+		'oldfieldtype': 'Select',
+		'options': '\nReturnable\nNon-Returnable',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'under_rule',
+		'fieldtype': 'Select',
+		'hidden': 1,
+		'idx': 29,
+		'label': 'Under Rule',
+		'oldfieldname': 'under_rule',
+		'oldfieldtype': 'Select',
+		'options': '\nOrdinary\n57 AC (5) a\n57 F (2) Non-Exc.',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'remarks',
+		'fieldtype': 'Text',
+		'idx': 30,
+		'label': 'Remarks',
+		'no_copy': 1,
+		'oldfieldname': 'remarks',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'cancel_reason',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 31,
+		'in_filter': 0,
+		'label': 'Cancel Reason',
+		'no_copy': 1,
+		'oldfieldname': 'cancel_reason',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 32,
+		'label': 'Items',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 33,
+		'label': 'Get Stock and Rate',
+		'oldfieldtype': 'Button',
+		'options': 'get_stock_and_rate',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 34,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'hidden': 0,
+		'idx': 35,
+		'label': 'Get Items',
+		'oldfieldtype': 'Button',
+		'options': 'get_items',
+		'permlevel': 2,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 36,
+		'oldfieldtype': 'Section Break',
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'mtn_details',
+		'fieldtype': 'Table',
+		'idx': 37,
+		'label': 'MTN Details',
+		'oldfieldname': 'mtn_details',
+		'oldfieldtype': 'Table',
+		'options': 'Stock Entry Detail',
+		'permlevel': 0,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'total_amount',
+		'fieldtype': 'Currency',
+		'idx': 38,
+		'label': 'Total Amount',
+		'oldfieldname': 'total_amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 39,
+		'label': 'Other Details',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 40,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 41,
+		'in_filter': 0,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'select_print_heading',
+		'fieldtype': 'Link',
+		'idx': 42,
+		'label': 'Select Print Heading',
+		'oldfieldname': 'select_print_heading',
+		'oldfieldtype': 'Link',
+		'options': 'Print Heading',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/leave_applicable_detail/__init__.py b/stock/doctype/stock_entry_detail/__init__.py
similarity index 100%
rename from payroll/doctype/leave_applicable_detail/__init__.py
rename to stock/doctype/stock_entry_detail/__init__.py
diff --git a/stock/doctype/stock_entry_detail/stock_entry_detail.txt b/stock/doctype/stock_entry_detail/stock_entry_detail.txt
new file mode 100644
index 0000000000..b4fca09638
--- /dev/null
+++ b/stock/doctype/stock_entry_detail/stock_entry_detail.txt
@@ -0,0 +1,281 @@
+# DocType, Stock Entry Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:25',
+		'docstatus': 0,
+		'modified': '2011-04-26 11:47:18',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'MTND/.######',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 24
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Stock Entry Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Stock Entry Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Stock Entry Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 's_warehouse',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'in_filter': 1,
+		'label': 'Source Warehouse',
+		'oldfieldname': 's_warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 2
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 't_warehouse',
+		'fieldtype': 'Link',
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'Target Warehouse',
+		'oldfieldname': 't_warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 2
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fg_item',
+		'fieldtype': 'Check',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'FG Item',
+		'oldfieldname': 'fg_item',
+		'oldfieldtype': 'Check',
+		'permlevel': 2,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_name',
+		'fieldtype': 'Data',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Item Name',
+		'permlevel': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 6,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'batch_no',
+		'fieldtype': 'Link',
+		'idx': 7,
+		'label': 'Batch No',
+		'oldfieldname': 'batch_no',
+		'oldfieldtype': 'Link',
+		'options': 'Batch',
+		'permlevel': 0,
+		'print_hide': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'actual_qty',
+		'fieldtype': 'Read Only',
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'Actual Qty (at source)',
+		'no_copy': 1,
+		'oldfieldname': 'actual_qty',
+		'oldfieldtype': 'Read Only',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'qty',
+		'fieldtype': 'Currency',
+		'idx': 9,
+		'label': 'Qty',
+		'oldfieldname': 'qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reqd_qty',
+		'fieldtype': 'Currency',
+		'idx': 10,
+		'in_filter': 0,
+		'label': 'Reqd Qty',
+		'oldfieldname': 'reqd_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 3,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'uom',
+		'fieldtype': 'Link',
+		'idx': 11,
+		'label': 'UOM',
+		'oldfieldname': 'uom',
+		'oldfieldtype': 'Link',
+		'options': 'UOM',
+		'permlevel': 0,
+		'reqd': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'conversion_factor',
+		'fieldtype': 'Currency',
+		'idx': 12,
+		'label': 'Conversion Factor',
+		'oldfieldname': 'conversion_factor',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_uom',
+		'fieldtype': 'Link',
+		'idx': 13,
+		'in_filter': 0,
+		'label': 'Stock UOM',
+		'oldfieldname': 'stock_uom',
+		'oldfieldtype': 'Link',
+		'options': 'UOM',
+		'permlevel': 1,
+		'reqd': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'transfer_qty',
+		'fieldtype': 'Currency',
+		'idx': 14,
+		'label': 'Stock Qty',
+		'oldfieldname': 'transfer_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'serial_no',
+		'fieldtype': 'Text',
+		'idx': 15,
+		'label': 'Serial No',
+		'no_copy': 1,
+		'oldfieldname': 'serial_no',
+		'oldfieldtype': 'Text',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'incoming_rate',
+		'fieldtype': 'Currency',
+		'idx': 16,
+		'label': 'Incoming Rate',
+		'oldfieldname': 'incoming_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amount',
+		'fieldtype': 'Currency',
+		'idx': 17,
+		'label': 'Amount',
+		'oldfieldname': 'amount',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/leave_application/__init__.py b/stock/doctype/stock_ledger/__init__.py
old mode 100755
new mode 100644
similarity index 100%
rename from payroll/doctype/leave_application/__init__.py
rename to stock/doctype/stock_ledger/__init__.py
diff --git a/material_management/doctype/stock_ledger/stock_ledger.py b/stock/doctype/stock_ledger/stock_ledger.py
similarity index 100%
rename from material_management/doctype/stock_ledger/stock_ledger.py
rename to stock/doctype/stock_ledger/stock_ledger.py
diff --git a/stock/doctype/stock_ledger/stock_ledger.txt b/stock/doctype/stock_ledger/stock_ledger.txt
new file mode 100644
index 0000000000..2bbfbb9c3e
--- /dev/null
+++ b/stock/doctype/stock_ledger/stock_ledger.txt
@@ -0,0 +1,59 @@
+# DocType, Stock Ledger
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:25',
+		'docstatus': 0,
+		'modified': '2010-12-16 23:57:05',
+		'modified_by': 'nabin@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'hide_toolbar': 1,
+		'in_create': 1,
+		'issingle': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'read_only': 1,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 10
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Stock Ledger',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 1,
+		'read': 1
+	},
+
+	# DocType, Stock Ledger
+	{
+		'doctype': 'DocType',
+		'name': 'Stock Ledger'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'All'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'Material User'
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/leave_control_panel/__init__.py b/stock/doctype/stock_ledger_entry/__init__.py
similarity index 100%
rename from payroll/doctype/leave_control_panel/__init__.py
rename to stock/doctype/stock_ledger_entry/__init__.py
diff --git a/material_management/doctype/stock_ledger_entry/stock_ledger_entry.py b/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
similarity index 100%
rename from material_management/doctype/stock_ledger_entry/stock_ledger_entry.py
rename to stock/doctype/stock_ledger_entry/stock_ledger_entry.py
diff --git a/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt b/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
new file mode 100644
index 0000000000..603f095aa3
--- /dev/null
+++ b/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
@@ -0,0 +1,447 @@
+# DocType, Stock Ledger Entry
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:25',
+		'docstatus': 0,
+		'modified': '2011-06-02 15:42:37',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1307707462',
+		'autoname': 'SLE/.########',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'hide_toolbar': 1,
+		'in_create': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 53
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Stock Ledger Entry',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Stock Ledger Entry',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Stock Ledger Entry
+	{
+		'doctype': 'DocType',
+		'name': 'Stock Ledger Entry'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'All'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 2,
+		'role': 'System Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'in_filter': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 1,
+		'reqd': 0,
+		'search_index': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'serial_no',
+		'fieldtype': 'Text',
+		'idx': 2,
+		'in_filter': 0,
+		'label': 'Serial No',
+		'permlevel': 0,
+		'search_index': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'batch_no',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Batch No',
+		'oldfieldname': 'batch_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'warehouse',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Warehouse',
+		'oldfieldname': 'warehouse',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse',
+		'permlevel': 1,
+		'search_index': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'warehouse_type',
+		'fieldtype': 'Select',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Warehouse Type',
+		'oldfieldname': 'warehouse_type',
+		'oldfieldtype': 'Select',
+		'options': 'link:Warehouse Type',
+		'permlevel': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'description': 'The date at which current entry will get or has actually executed.',
+		'doctype': 'DocField',
+		'fieldname': 'posting_date',
+		'fieldtype': 'Date',
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Posting Date',
+		'oldfieldname': 'posting_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'reqd': 0,
+		'search_index': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'posting_time',
+		'fieldtype': 'Time',
+		'idx': 7,
+		'in_filter': 0,
+		'label': 'Posting Time',
+		'oldfieldname': 'posting_time',
+		'oldfieldtype': 'Time',
+		'permlevel': 1,
+		'search_index': 0,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'description': 'The date at which current entry is made in system.',
+		'doctype': 'DocField',
+		'fieldname': 'transaction_date',
+		'fieldtype': 'Date',
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'Transaction Date',
+		'oldfieldname': 'transaction_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'search_index': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'voucher_type',
+		'fieldtype': 'Data',
+		'idx': 9,
+		'in_filter': 1,
+		'label': 'Voucher Type',
+		'oldfieldname': 'voucher_type',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'voucher_no',
+		'fieldtype': 'Data',
+		'idx': 10,
+		'in_filter': 1,
+		'label': 'Voucher No',
+		'oldfieldname': 'voucher_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'voucher_detail_no',
+		'fieldtype': 'Data',
+		'idx': 11,
+		'label': 'Voucher Detail No',
+		'oldfieldname': 'voucher_detail_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'actual_qty',
+		'fieldtype': 'Currency',
+		'idx': 12,
+		'in_filter': 1,
+		'label': 'Actual Quantity',
+		'oldfieldname': 'actual_qty',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'incoming_rate',
+		'fieldtype': 'Currency',
+		'idx': 13,
+		'label': 'Incoming Rate',
+		'oldfieldname': 'incoming_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_uom',
+		'fieldtype': 'Data',
+		'idx': 14,
+		'label': 'Stock UOM',
+		'oldfieldname': 'stock_uom',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'bin_aqat',
+		'fieldtype': 'Currency',
+		'idx': 15,
+		'in_filter': 1,
+		'label': 'Bin Actual Qty After Transaction',
+		'oldfieldname': 'bin_aqat',
+		'oldfieldtype': 'Currency',
+		'permlevel': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'ma_rate',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 16,
+		'label': 'Moving Average Rate',
+		'oldfieldname': 'ma_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fcfs_rate',
+		'fieldtype': 'Currency',
+		'hidden': 1,
+		'idx': 17,
+		'label': 'FIFO Rate',
+		'oldfieldname': 'fcfs_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'valuation_rate',
+		'fieldtype': 'Currency',
+		'idx': 18,
+		'label': 'Valuation Rate',
+		'oldfieldname': 'valuation_rate',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'stock_value',
+		'fieldtype': 'Currency',
+		'idx': 19,
+		'label': 'Stock Value',
+		'oldfieldname': 'stock_value',
+		'oldfieldtype': 'Currency',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fcfs_stack',
+		'fieldtype': 'Text',
+		'hidden': 0,
+		'idx': 20,
+		'in_filter': 0,
+		'label': 'FIFO Stack',
+		'oldfieldname': 'fcfs_stack',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 0,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Data',
+		'idx': 21,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Data',
+		'idx': 22,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'search_index': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_cancelled',
+		'fieldtype': 'Select',
+		'idx': 23,
+		'in_filter': 1,
+		'label': 'Is Cancelled',
+		'oldfieldname': 'is_cancelled',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 1,
+		'search_index': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_stock_entry',
+		'fieldtype': 'Select',
+		'idx': 24,
+		'in_filter': 1,
+		'label': 'Is Stock Entry',
+		'oldfieldname': 'is_stock_entry',
+		'oldfieldtype': 'Select',
+		'options': '\nYes\nNo',
+		'permlevel': 1,
+		'search_index': 1,
+		'width': '100px'
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/leave_detail/__init__.py b/stock/doctype/stock_reconciliation/__init__.py
similarity index 100%
rename from payroll/doctype/leave_detail/__init__.py
rename to stock/doctype/stock_reconciliation/__init__.py
diff --git a/material_management/doctype/stock_reconciliation/stock_reconciliation.js b/stock/doctype/stock_reconciliation/stock_reconciliation.js
similarity index 100%
rename from material_management/doctype/stock_reconciliation/stock_reconciliation.js
rename to stock/doctype/stock_reconciliation/stock_reconciliation.js
diff --git a/material_management/doctype/stock_reconciliation/stock_reconciliation.py b/stock/doctype/stock_reconciliation/stock_reconciliation.py
similarity index 100%
rename from material_management/doctype/stock_reconciliation/stock_reconciliation.py
rename to stock/doctype/stock_reconciliation/stock_reconciliation.py
diff --git a/stock/doctype/stock_reconciliation/stock_reconciliation.txt b/stock/doctype/stock_reconciliation/stock_reconciliation.txt
new file mode 100644
index 0000000000..1080a27e05
--- /dev/null
+++ b/stock/doctype/stock_reconciliation/stock_reconciliation.txt
@@ -0,0 +1,260 @@
+# DocType, Stock Reconciliation
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:26',
+		'docstatus': 0,
+		'modified': '2011-04-25 11:46:21',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1307707462',
+		'allow_attach': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'max_attachments': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'search_fields': 'reconciliation_date',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 85
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Stock Reconciliation',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Stock Reconciliation',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Stock Reconciliation
+	{
+		'doctype': 'DocType',
+		'name': 'Stock Reconciliation'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'Material Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'Material Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'hidden': 1,
+		'idx': 1,
+		'label': 'Validate Data',
+		'oldfieldtype': 'Button',
+		'options': 'get_reconciliation_stock_details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 2,
+		'label': 'Summary',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reconciliation_date',
+		'fieldtype': 'Date',
+		'idx': 3,
+		'in_filter': 0,
+		'label': 'Reconciliation Date',
+		'oldfieldname': 'reconciliation_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reconciliation_time',
+		'fieldtype': 'Time',
+		'idx': 4,
+		'in_filter': 0,
+		'label': 'Reconciliation Time',
+		'oldfieldname': 'reconciliation_time',
+		'oldfieldtype': 'Time',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'next_step',
+		'fieldtype': 'Select',
+		'idx': 5,
+		'label': 'Next Steps',
+		'oldfieldname': 'next_step',
+		'oldfieldtype': 'Select',
+		'options': 'Upload File and Save Document\nValidate Data\nSubmit Document\nCompleted',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'remark',
+		'fieldtype': 'Text',
+		'idx': 6,
+		'label': 'Remark',
+		'oldfieldname': 'remark',
+		'oldfieldtype': 'Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 7,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'idx': 9,
+		'label': 'Amended From',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'idx': 10,
+		'label': 'Amendment Date',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 11,
+		'label': 'Attachment',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 12,
+		'label': 'Attachment HTML',
+		'oldfieldtype': 'HTML',
+		'options': 'The attachment must be a CSV(Comma Seperated Value) file',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'file_list',
+		'fieldtype': 'Text',
+		'hidden': 1,
+		'idx': 13,
+		'label': 'File List',
+		'oldfieldname': 'file_list',
+		'oldfieldtype': 'Text',
+		'permlevel': 1,
+		'print_hide': 1
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/leave_type/__init__.py b/stock/doctype/stock_uom_replace_utility/__init__.py
similarity index 100%
rename from payroll/doctype/leave_type/__init__.py
rename to stock/doctype/stock_uom_replace_utility/__init__.py
diff --git a/material_management/doctype/stock_uom_replace_utility/stock_uom_replace_utility.js b/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.js
similarity index 100%
rename from material_management/doctype/stock_uom_replace_utility/stock_uom_replace_utility.js
rename to stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.js
diff --git a/material_management/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py b/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py
similarity index 100%
rename from material_management/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py
rename to stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py
diff --git a/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt b/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt
new file mode 100644
index 0000000000..7818530371
--- /dev/null
+++ b/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt
@@ -0,0 +1,161 @@
+# DocType, Stock UOM Replace Utility
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:26',
+		'docstatus': 0,
+		'modified': '2010-12-23 14:40:02',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 0,
+		'issingle': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'read_only': 0,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 25
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Stock UOM Replace Utility',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Stock UOM Replace Utility',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Stock UOM Replace Utility
+	{
+		'doctype': 'DocType',
+		'name': 'Stock UOM Replace Utility'
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'System Manager',
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'Material Master Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Material Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 1,
+		'role': 'Material Master Manager'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'Material Manager'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'label': 'Item',
+		'options': 'Item',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'current_stock_uom',
+		'fieldtype': 'Link',
+		'idx': 2,
+		'label': 'Current Stock UOM',
+		'options': 'UOM',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'new_stock_uom',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'label': 'New Stock UOM',
+		'options': 'UOM',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 5,
+		'label': 'Update',
+		'options': 'update_stock_uom',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'conversion_factor',
+		'fieldtype': 'Currency',
+		'idx': 11,
+		'label': 'Conversion Factor',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/leave_type_detail/__init__.py b/stock/doctype/uom_conversion_detail/__init__.py
similarity index 100%
rename from payroll/doctype/leave_type_detail/__init__.py
rename to stock/doctype/uom_conversion_detail/__init__.py
diff --git a/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt b/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt
new file mode 100644
index 0000000000..14608be94b
--- /dev/null
+++ b/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt
@@ -0,0 +1,65 @@
+# DocType, UOM Conversion Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:29',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'UCDD/.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 1
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'UOM Conversion Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, UOM Conversion Detail
+	{
+		'doctype': 'DocType',
+		'name': 'UOM Conversion Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'uom',
+		'fieldtype': 'Link',
+		'idx': 10,
+		'label': 'UOM',
+		'oldfieldname': 'uom',
+		'oldfieldtype': 'Link',
+		'options': 'UOM'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'conversion_factor',
+		'fieldtype': 'Float',
+		'idx': 11,
+		'label': 'Conversion Factor',
+		'oldfieldname': 'conversion_factor',
+		'oldfieldtype': 'Float'
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/other_income_detail/__init__.py b/stock/doctype/valuation_control/__init__.py
similarity index 100%
rename from payroll/doctype/other_income_detail/__init__.py
rename to stock/doctype/valuation_control/__init__.py
diff --git a/material_management/doctype/valuation_control/valuation_control.py b/stock/doctype/valuation_control/valuation_control.py
similarity index 100%
rename from material_management/doctype/valuation_control/valuation_control.py
rename to stock/doctype/valuation_control/valuation_control.py
diff --git a/material_management/doctype/valuation_control/valuation_control.py~ b/stock/doctype/valuation_control/valuation_control.py~
similarity index 100%
rename from material_management/doctype/valuation_control/valuation_control.py~
rename to stock/doctype/valuation_control/valuation_control.py~
diff --git a/stock/doctype/valuation_control/valuation_control.txt b/stock/doctype/valuation_control/valuation_control.txt
new file mode 100644
index 0000000000..c2a293538a
--- /dev/null
+++ b/stock/doctype/valuation_control/valuation_control.txt
@@ -0,0 +1,31 @@
+# DocType, Valuation Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:30',
+		'docstatus': 0,
+		'modified': '2010-12-23 11:18:22',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 1,
+		'issingle': 1,
+		'module': 'Stock',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 4
+	},
+
+	# DocType, Valuation Control
+	{
+		'doctype': 'DocType',
+		'name': 'Valuation Control'
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/payroll_rule/__init__.py b/stock/doctype/warehouse/__init__.py
similarity index 100%
rename from payroll/doctype/payroll_rule/__init__.py
rename to stock/doctype/warehouse/__init__.py
diff --git a/material_management/doctype/warehouse/warehouse.js b/stock/doctype/warehouse/warehouse.js
similarity index 100%
rename from material_management/doctype/warehouse/warehouse.js
rename to stock/doctype/warehouse/warehouse.js
diff --git a/material_management/doctype/warehouse/warehouse.py b/stock/doctype/warehouse/warehouse.py
similarity index 100%
rename from material_management/doctype/warehouse/warehouse.py
rename to stock/doctype/warehouse/warehouse.py
diff --git a/stock/doctype/warehouse/warehouse.txt b/stock/doctype/warehouse/warehouse.txt
new file mode 100644
index 0000000000..3d69b07e5f
--- /dev/null
+++ b/stock/doctype/warehouse/warehouse.txt
@@ -0,0 +1,460 @@
+# DocType, Warehouse
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:30',
+		'docstatus': 0,
+		'modified': '2010-12-16 23:57:04',
+		'modified_by': 'nabin@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1300788639',
+		'allow_trash': 1,
+		'autoname': 'field:warehouse_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'module': 'Stock',
+		'name': '__common__',
+		'search_fields': 'warehouse_type',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 55
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Warehouse',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Warehouse',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Warehouse
+	{
+		'doctype': 'DocType',
+		'name': 'Warehouse'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 2,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'Material User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 2,
+		'role': 'Material Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Material Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'Material Manager',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 7,
+		'permlevel': 1,
+		'role': 'All'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 8,
+		'permlevel': 0,
+		'role': 'Material Master Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 9,
+		'permlevel': 1,
+		'role': 'Material Master Manager'
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 10,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 11,
+		'permlevel': 2,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 2,
+		'label': 'Warehouse Detail',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'warehouse_name',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Warehouse Name',
+		'oldfieldname': 'warehouse_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'warehouse_type',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'label': 'Warehouse Type',
+		'oldfieldname': 'warehouse_type',
+		'oldfieldtype': 'Link',
+		'options': 'Warehouse Type',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'The valuation of items in this warehouse will be considered for the company that is specified',
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'email_id',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 6,
+		'label': 'Email Id',
+		'oldfieldname': 'email_id',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'auto_indent_mail',
+		'fieldtype': 'Select',
+		'hidden': 1,
+		'idx': 7,
+		'label': 'Send Reorder Alert Mail ',
+		'no_copy': 1,
+		'oldfieldname': 'auto_indent_mail',
+		'oldfieldtype': 'Select',
+		'options': 'No\nYes',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1,
+		'reqd': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'phone_no',
+		'fieldtype': 'Int',
+		'idx': 8,
+		'label': 'Phone No',
+		'oldfieldname': 'phone_no',
+		'oldfieldtype': 'Int',
+		'options': 'Phone',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'mobile_no',
+		'fieldtype': 'Int',
+		'idx': 9,
+		'label': 'Mobile No',
+		'oldfieldname': 'mobile_no',
+		'oldfieldtype': 'Int',
+		'options': 'Phone',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 10,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'address_line_1',
+		'fieldtype': 'Data',
+		'idx': 11,
+		'label': 'Address Line 1',
+		'oldfieldname': 'address_line_1',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'address_line_2',
+		'fieldtype': 'Data',
+		'idx': 12,
+		'label': 'Address Line 2',
+		'oldfieldname': 'address_line_2',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 0,
+		'doctype': 'DocField',
+		'fieldname': 'country',
+		'fieldtype': 'Link',
+		'hidden': 0,
+		'idx': 13,
+		'in_filter': 0,
+		'label': 'Country',
+		'no_copy': 0,
+		'oldfieldname': 'country',
+		'oldfieldtype': 'Link',
+		'options': 'Country',
+		'permlevel': 0,
+		'print_hide': 0,
+		'report_hide': 0,
+		'reqd': 0,
+		'search_index': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'state',
+		'fieldtype': 'Select',
+		'idx': 14,
+		'label': 'State',
+		'oldfieldname': 'state',
+		'oldfieldtype': 'Select',
+		'options': '\nSelect country first',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'city',
+		'fieldtype': 'Data',
+		'idx': 15,
+		'label': 'City',
+		'oldfieldname': 'city',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'pin',
+		'fieldtype': 'Int',
+		'idx': 16,
+		'label': 'PIN',
+		'oldfieldname': 'pin',
+		'oldfieldtype': 'Int',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 17,
+		'label': 'Repost Stock',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 2
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'hidden': 0,
+		'idx': 18,
+		'label': 'Repost Stock Ledger',
+		'oldfieldtype': 'Button',
+		'options': 'repost_stock',
+		'permlevel': 2
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'test_field2',
+		'fieldtype': 'Data',
+		'idx': 19,
+		'label': 'Test Field2',
+		'oldfieldname': 'test_field2',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'test_field1',
+		'fieldtype': 'Data',
+		'idx': 20,
+		'label': 'Test Field1',
+		'oldfieldname': 'test_field1',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'test_field',
+		'fieldtype': 'Data',
+		'idx': 21,
+		'label': 'Test Field',
+		'oldfieldname': 'test_field',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/payroll/doctype/previous_experience_detail/__init__.py b/stock/page/__init__.py
similarity index 100%
rename from payroll/doctype/previous_experience_detail/__init__.py
rename to stock/page/__init__.py
diff --git a/payroll/doctype/professional_training_details/__init__.py b/stock/search_criteria/__init__.py
similarity index 100%
rename from payroll/doctype/professional_training_details/__init__.py
rename to stock/search_criteria/__init__.py
diff --git a/payroll/doctype/rule_engine/__init__.py b/stock/search_criteria/itemwise_price_list/__init__.py
similarity index 100%
rename from payroll/doctype/rule_engine/__init__.py
rename to stock/search_criteria/itemwise_price_list/__init__.py
diff --git a/material_management/search_criteria/itemwise_price_list/itemwise_price_list.js b/stock/search_criteria/itemwise_price_list/itemwise_price_list.js
similarity index 100%
rename from material_management/search_criteria/itemwise_price_list/itemwise_price_list.js
rename to stock/search_criteria/itemwise_price_list/itemwise_price_list.js
diff --git a/material_management/search_criteria/itemwise_price_list/itemwise_price_list.txt b/stock/search_criteria/itemwise_price_list/itemwise_price_list.txt
similarity index 100%
rename from material_management/search_criteria/itemwise_price_list/itemwise_price_list.txt
rename to stock/search_criteria/itemwise_price_list/itemwise_price_list.txt
diff --git a/payroll/doctype/salary_slip/__init__.py b/stock/search_criteria/shortage_to_indent/__init__.py
similarity index 100%
rename from payroll/doctype/salary_slip/__init__.py
rename to stock/search_criteria/shortage_to_indent/__init__.py
diff --git a/material_management/search_criteria/shortage_to_indent/shortage_to_indent.js b/stock/search_criteria/shortage_to_indent/shortage_to_indent.js
similarity index 100%
rename from material_management/search_criteria/shortage_to_indent/shortage_to_indent.js
rename to stock/search_criteria/shortage_to_indent/shortage_to_indent.js
diff --git a/material_management/search_criteria/shortage_to_indent/shortage_to_indent.py b/stock/search_criteria/shortage_to_indent/shortage_to_indent.py
similarity index 100%
rename from material_management/search_criteria/shortage_to_indent/shortage_to_indent.py
rename to stock/search_criteria/shortage_to_indent/shortage_to_indent.py
diff --git a/material_management/search_criteria/shortage_to_indent/shortage_to_indent.txt b/stock/search_criteria/shortage_to_indent/shortage_to_indent.txt
similarity index 100%
rename from material_management/search_criteria/shortage_to_indent/shortage_to_indent.txt
rename to stock/search_criteria/shortage_to_indent/shortage_to_indent.txt
diff --git a/payroll/doctype/salary_slip_control_panel/__init__.py b/stock/search_criteria/stock_aging_report/__init__.py
similarity index 100%
rename from payroll/doctype/salary_slip_control_panel/__init__.py
rename to stock/search_criteria/stock_aging_report/__init__.py
diff --git a/material_management/search_criteria/stock_aging_report/stock_aging_report.js b/stock/search_criteria/stock_aging_report/stock_aging_report.js
similarity index 100%
rename from material_management/search_criteria/stock_aging_report/stock_aging_report.js
rename to stock/search_criteria/stock_aging_report/stock_aging_report.js
diff --git a/material_management/search_criteria/stock_aging_report/stock_aging_report.py b/stock/search_criteria/stock_aging_report/stock_aging_report.py
similarity index 100%
rename from material_management/search_criteria/stock_aging_report/stock_aging_report.py
rename to stock/search_criteria/stock_aging_report/stock_aging_report.py
diff --git a/material_management/search_criteria/stock_aging_report/stock_aging_report.txt b/stock/search_criteria/stock_aging_report/stock_aging_report.txt
similarity index 100%
rename from material_management/search_criteria/stock_aging_report/stock_aging_report.txt
rename to stock/search_criteria/stock_aging_report/stock_aging_report.txt
diff --git a/payroll/doctype/salary_structure/__init__.py b/stock/search_criteria/stock_ledger/__init__.py
similarity index 100%
rename from payroll/doctype/salary_structure/__init__.py
rename to stock/search_criteria/stock_ledger/__init__.py
diff --git a/material_management/search_criteria/stock_ledger/stock_ledger.js b/stock/search_criteria/stock_ledger/stock_ledger.js
similarity index 100%
rename from material_management/search_criteria/stock_ledger/stock_ledger.js
rename to stock/search_criteria/stock_ledger/stock_ledger.js
diff --git a/material_management/search_criteria/stock_ledger/stock_ledger.txt b/stock/search_criteria/stock_ledger/stock_ledger.txt
similarity index 100%
rename from material_management/search_criteria/stock_ledger/stock_ledger.txt
rename to stock/search_criteria/stock_ledger/stock_ledger.txt
diff --git a/payroll/doctype/ss_deduction_detail/__init__.py b/stock/search_criteria/stock_level/__init__.py
similarity index 100%
rename from payroll/doctype/ss_deduction_detail/__init__.py
rename to stock/search_criteria/stock_level/__init__.py
diff --git a/material_management/search_criteria/stock_level/stock_level.js b/stock/search_criteria/stock_level/stock_level.js
similarity index 100%
rename from material_management/search_criteria/stock_level/stock_level.js
rename to stock/search_criteria/stock_level/stock_level.js
diff --git a/material_management/search_criteria/stock_level/stock_level.py b/stock/search_criteria/stock_level/stock_level.py
similarity index 100%
rename from material_management/search_criteria/stock_level/stock_level.py
rename to stock/search_criteria/stock_level/stock_level.py
diff --git a/material_management/search_criteria/stock_level/stock_level.txt b/stock/search_criteria/stock_level/stock_level.txt
similarity index 100%
rename from material_management/search_criteria/stock_level/stock_level.txt
rename to stock/search_criteria/stock_level/stock_level.txt
diff --git a/payroll/doctype/ss_earning_detail/__init__.py b/stock/search_criteria/stock_report/__init__.py
similarity index 100%
rename from payroll/doctype/ss_earning_detail/__init__.py
rename to stock/search_criteria/stock_report/__init__.py
diff --git a/material_management/search_criteria/stock_report/stock_report.js b/stock/search_criteria/stock_report/stock_report.js
similarity index 100%
rename from material_management/search_criteria/stock_report/stock_report.js
rename to stock/search_criteria/stock_report/stock_report.js
diff --git a/material_management/search_criteria/stock_report/stock_report.py b/stock/search_criteria/stock_report/stock_report.py
similarity index 100%
rename from material_management/search_criteria/stock_report/stock_report.py
rename to stock/search_criteria/stock_report/stock_report.py
diff --git a/material_management/search_criteria/stock_report/stock_report.txt b/stock/search_criteria/stock_report/stock_report.txt
similarity index 100%
rename from material_management/search_criteria/stock_report/stock_report.txt
rename to stock/search_criteria/stock_report/stock_report.txt
diff --git a/material_management/tests.py b/stock/tests.py
similarity index 100%
rename from material_management/tests.py
rename to stock/tests.py
diff --git a/accounts/DocType Label/Ticket/Ticket.txt b/support/DocType Label/Ticket/Ticket.txt
similarity index 100%
rename from accounts/DocType Label/Ticket/Ticket.txt
rename to support/DocType Label/Ticket/Ticket.txt
diff --git a/mapper/DocType Mapper/Customer Issue-Maintenance Visit/Customer Issue-Maintenance Visit.txt b/support/DocType Mapper/Customer Issue-Maintenance Visit/Customer Issue-Maintenance Visit.txt
similarity index 100%
rename from mapper/DocType Mapper/Customer Issue-Maintenance Visit/Customer Issue-Maintenance Visit.txt
rename to support/DocType Mapper/Customer Issue-Maintenance Visit/Customer Issue-Maintenance Visit.txt
diff --git a/mapper/DocType Mapper/Sales Order-Maintenance Schedule/Sales Order-Maintenance Schedule.txt b/support/DocType Mapper/Sales Order-Maintenance Schedule/Sales Order-Maintenance Schedule.txt
similarity index 100%
rename from mapper/DocType Mapper/Sales Order-Maintenance Schedule/Sales Order-Maintenance Schedule.txt
rename to support/DocType Mapper/Sales Order-Maintenance Schedule/Sales Order-Maintenance Schedule.txt
diff --git a/mapper/DocType Mapper/Sales Order-Maintenance Visit/Sales Order-Maintenance Visit.txt b/support/DocType Mapper/Sales Order-Maintenance Visit/Sales Order-Maintenance Visit.txt
similarity index 100%
rename from mapper/DocType Mapper/Sales Order-Maintenance Visit/Sales Order-Maintenance Visit.txt
rename to support/DocType Mapper/Sales Order-Maintenance Visit/Sales Order-Maintenance Visit.txt
diff --git a/support/Module Def/Support/Support.txt b/support/Module Def/Support/Support.txt
new file mode 100644
index 0000000000..9b39572756
--- /dev/null
+++ b/support/Module Def/Support/Support.txt	
@@ -0,0 +1,281 @@
+[
+	{
+		'_last_update': None,
+		'creation': '2011-06-30 15:51:59',
+		'disabled': 'No',
+		'docstatus': 0,
+		'doctype': u'Module Def',
+		'doctype_list': 'DocType Label, Ticket',
+		'file_list': None,
+		'idx': None,
+		'is_hidden': 'No',
+		'last_updated_date': None,
+		'modified': '2011-07-01 09:36:38',
+		'modified_by': 'Administrator',
+		'module_desc': 'Manage maintenance quotes, orders, schedule etc.',
+		'module_icon': 'Maintenance.gif',
+		'module_label': 'Support',
+		'module_name': 'Support',
+		'module_page': None,
+		'module_seq': 8,
+		'name': 'Support',
+		'owner': 'Administrator',
+		'parent': None,
+		'parentfield': None,
+		'parenttype': None,
+		'trash_reason': None,
+		'widget_code': None
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:51:59',
+		'description': 'A unique number identifying each entity of an item',
+		'display_name': 'Serial No',
+		'doc_name': 'Serial No',
+		'doc_type': 'Forms',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': 'item_code\nstatus\npr_no\ndelivery_note_no\ncustomer',
+		'hide': None,
+		'icon': None,
+		'idx': 1,
+		'modified': '2011-07-01 09:36:38',
+		'modified_by': 'Administrator',
+		'name': 'MDI01361',
+		'owner': 'Administrator',
+		'parent': 'Support',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:51:59',
+		'description': "Database of Support Ticket's raised by Customers",
+		'display_name': 'Support Ticket',
+		'doc_name': 'Support Ticket',
+		'doc_type': 'Forms',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': 'status\nopening_date\ncustomer\nallocated_to',
+		'hide': None,
+		'icon': None,
+		'idx': 2,
+		'modified': '2011-07-01 09:36:38',
+		'modified_by': 'Administrator',
+		'name': 'MDI01362',
+		'owner': 'Administrator',
+		'parent': 'Support',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:51:59',
+		'description': 'Create schedule based on maintenance order',
+		'display_name': 'Maintenance Schedule',
+		'doc_name': 'Maintenance Schedule',
+		'doc_type': 'Forms',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': 'status\ntransaction_date\ncustomer\nsales_order_no',
+		'hide': None,
+		'icon': None,
+		'idx': 3,
+		'modified': '2011-07-01 09:36:38',
+		'modified_by': 'Administrator',
+		'name': 'MDI01363',
+		'owner': 'Administrator',
+		'parent': 'Support',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:51:59',
+		'description': 'Database of issues raised your Customers',
+		'display_name': 'Customer Issue',
+		'doc_name': 'Customer Issue',
+		'doc_type': 'Forms',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': 'status\ncomplaint_date\ncustomer\nallocated_to\nallocated_on',
+		'hide': None,
+		'icon': None,
+		'idx': 4,
+		'modified': '2011-07-01 09:36:38',
+		'modified_by': 'Administrator',
+		'name': 'MDI01364',
+		'owner': 'Administrator',
+		'parent': 'Support',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:51:59',
+		'description': None,
+		'display_name': 'Maintenance Visit',
+		'doc_name': 'Maintenance Visit',
+		'doc_type': 'Forms',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': 'status\nmntc_date\ncustomer\nmaintenance_type\ncompletion_status',
+		'hide': None,
+		'icon': None,
+		'idx': 5,
+		'modified': '2011-07-01 09:36:38',
+		'modified_by': 'Administrator',
+		'name': 'MDI01365',
+		'owner': 'Administrator',
+		'parent': 'Support',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:51:59',
+		'description': 'List of all scheduled mainteance. You can filter by sales person, date, serial no etc. ',
+		'display_name': 'Maintenance Schedule Details',
+		'doc_name': 'Maintenance Schedule Detail',
+		'doc_type': 'Reports',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': None,
+		'hide': None,
+		'icon': None,
+		'idx': 6,
+		'modified': '2011-07-01 09:36:38',
+		'modified_by': 'Administrator',
+		'name': 'MDI01366',
+		'owner': 'Administrator',
+		'parent': 'Support',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:51:59',
+		'description': 'List of all issues raised by customer',
+		'display_name': 'Customer Issues',
+		'doc_name': 'Customer Issue',
+		'doc_type': 'Reports',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': None,
+		'hide': None,
+		'icon': None,
+		'idx': 7,
+		'modified': '2011-07-01 09:36:38',
+		'modified_by': 'Administrator',
+		'name': 'MDI01367',
+		'owner': 'Administrator',
+		'parent': 'Support',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:51:59',
+		'description': None,
+		'display_name': 'Warranty/AMC Expiry Details',
+		'doc_name': 'Serial No',
+		'doc_type': 'Reports',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': None,
+		'hide': None,
+		'icon': None,
+		'idx': 8,
+		'modified': '2011-07-01 09:36:38',
+		'modified_by': 'Administrator',
+		'name': 'MDI01368',
+		'owner': 'Administrator',
+		'parent': 'Support',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:51:59',
+		'description': None,
+		'display_name': 'Warranty/AMC Summary',
+		'doc_name': 'Serial No',
+		'doc_type': 'Reports',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': None,
+		'hide': None,
+		'icon': None,
+		'idx': 9,
+		'modified': '2011-07-01 09:36:38',
+		'modified_by': 'Administrator',
+		'name': 'MDI01369',
+		'owner': 'Administrator',
+		'parent': 'Support',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'click_function': None,
+		'creation': '2011-06-30 15:51:59',
+		'description': None,
+		'display_name': 'Maintenance Orderwise Pending Amount To Bill',
+		'doc_name': 'Sales Order Detail',
+		'doc_type': 'Reports',
+		'docstatus': 0,
+		'doctype': 'Module Def Item',
+		'fields': None,
+		'hide': None,
+		'icon': None,
+		'idx': 10,
+		'modified': '2011-07-01 09:36:38',
+		'modified_by': 'Administrator',
+		'name': 'MDI01370',
+		'owner': 'Administrator',
+		'parent': 'Support',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+	{
+		'creation': '2011-06-30 15:51:59',
+		'docstatus': 0,
+		'doctype': 'Module Def Role',
+		'idx': 1,
+		'modified': '2011-07-01 09:36:38',
+		'modified_by': 'Administrator',
+		'name': 'MDR00342',
+		'owner': 'Administrator',
+		'parent': 'Support',
+		'parentfield': 'roles',
+		'parenttype': 'Module Def',
+		'role': 'Administrator'
+	},
+	{
+		'creation': '2011-06-30 15:51:59',
+		'docstatus': 0,
+		'doctype': 'Module Def Role',
+		'idx': 2,
+		'modified': '2011-07-01 09:36:38',
+		'modified_by': 'Administrator',
+		'name': 'MDR00343',
+		'owner': 'Administrator',
+		'parent': 'Support',
+		'parentfield': 'roles',
+		'parenttype': 'Module Def',
+		'role': 'Maintenance User'
+	},
+	{
+		'creation': '2011-06-30 15:51:59',
+		'docstatus': 0,
+		'doctype': 'Module Def Role',
+		'idx': 3,
+		'modified': '2011-07-01 09:36:38',
+		'modified_by': 'Administrator',
+		'name': 'MDR00344',
+		'owner': 'Administrator',
+		'parent': 'Support',
+		'parentfield': 'roles',
+		'parenttype': 'Module Def',
+		'role': 'Maintenance Manager'
+	}
+]
\ No newline at end of file
diff --git a/roles/Role/Maintenance Manager/Maintenance Manager.txt b/support/Role/Maintenance Manager/Maintenance Manager.txt
similarity index 100%
rename from roles/Role/Maintenance Manager/Maintenance Manager.txt
rename to support/Role/Maintenance Manager/Maintenance Manager.txt
diff --git a/roles/Role/Maintenance User/Maintenance User.txt b/support/Role/Maintenance User/Maintenance User.txt
similarity index 100%
rename from roles/Role/Maintenance User/Maintenance User.txt
rename to support/Role/Maintenance User/Maintenance User.txt
diff --git a/roles/Role/Support Manager/Support Manager.txt b/support/Role/Support Manager/Support Manager.txt
similarity index 100%
rename from roles/Role/Support Manager/Support Manager.txt
rename to support/Role/Support Manager/Support Manager.txt
diff --git a/roles/Role/Support Team/Support Team.txt b/support/Role/Support Team/Support Team.txt
similarity index 100%
rename from roles/Role/Support Team/Support Team.txt
rename to support/Role/Support Team/Support Team.txt
diff --git a/payroll/page/__init__.py b/support/__init__.py
similarity index 100%
rename from payroll/page/__init__.py
rename to support/__init__.py
diff --git a/payroll/search_criteria/__init__.py b/support/doctype/__init__.py
similarity index 100%
rename from payroll/search_criteria/__init__.py
rename to support/doctype/__init__.py
diff --git a/payroll/search_criteria/appraisal_custom/__init__.py b/support/doctype/customer_issue/__init__.py
similarity index 100%
rename from payroll/search_criteria/appraisal_custom/__init__.py
rename to support/doctype/customer_issue/__init__.py
diff --git a/maintenance/doctype/customer_issue/customer_issue.js b/support/doctype/customer_issue/customer_issue.js
similarity index 100%
rename from maintenance/doctype/customer_issue/customer_issue.js
rename to support/doctype/customer_issue/customer_issue.js
diff --git a/maintenance/doctype/customer_issue/customer_issue.py b/support/doctype/customer_issue/customer_issue.py
similarity index 100%
rename from maintenance/doctype/customer_issue/customer_issue.py
rename to support/doctype/customer_issue/customer_issue.py
diff --git a/support/doctype/customer_issue/customer_issue.txt b/support/doctype/customer_issue/customer_issue.txt
new file mode 100644
index 0000000000..93c274f1fe
--- /dev/null
+++ b/support/doctype/customer_issue/customer_issue.txt
@@ -0,0 +1,674 @@
+# DocType, Customer Issue
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:57',
+		'docstatus': 0,
+		'modified': '2011-05-27 18:30:14',
+		'modified_by': 'Administrator',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308741898',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'Support',
+		'name': '__common__',
+		'search_fields': 'status,customer,customer_name,allocated_to,allocated_on, territory',
+		'section_style': 'Tabbed',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': '%(complaint)s By %(complaint_raised_by)s on %(issue_date)s',
+		'tag_fields': 'status',
+		'version': 96
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Customer Issue',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Customer Issue',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Customer Issue
+	{
+		'doctype': 'DocType',
+		'name': 'Customer Issue'
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'Guest',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 0,
+		'role': 'Maintenance Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 1,
+		'role': 'Maintenance Manager'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 0,
+		'role': 'Maintenance User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 7,
+		'permlevel': 1,
+		'role': 'Maintenance User'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Customer Issue',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'naming_series',
+		'fieldtype': 'Select',
+		'idx': 2,
+		'in_filter': 0,
+		'label': 'Series',
+		'no_copy': 1,
+		'oldfieldname': 'naming_series',
+		'oldfieldtype': 'Select',
+		'options': '\nCI/2010-2011/',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Open',
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Select',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Status',
+		'no_copy': 1,
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Select',
+		'options': '\nOpen\nClosed\nWork In Progress\nCancelled',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'default': 'Today',
+		'doctype': 'DocField',
+		'fieldname': 'complaint_date',
+		'fieldtype': 'Date',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Issue Date',
+		'oldfieldname': 'complaint_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'complaint_raised_by',
+		'fieldtype': 'Data',
+		'idx': 5,
+		'label': 'Raised By',
+		'oldfieldname': 'complaint_raised_by',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'from_company',
+		'fieldtype': 'Data',
+		'idx': 6,
+		'label': 'From Company',
+		'oldfieldname': 'from_company',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'service_address',
+		'fieldtype': 'Small Text',
+		'idx': 7,
+		'label': 'Service Address',
+		'oldfieldname': 'service_address',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 8,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'customer',
+		'fieldtype': 'Link',
+		'idx': 9,
+		'in_filter': 1,
+		'label': 'Customer',
+		'oldfieldname': 'customer',
+		'oldfieldtype': 'Link',
+		'options': 'Customer',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_address',
+		'fieldtype': 'Link',
+		'idx': 10,
+		'label': 'Customer Address',
+		'options': 'Address',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_person',
+		'fieldtype': 'Link',
+		'idx': 11,
+		'label': 'Contact Person',
+		'options': 'Contact',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_name',
+		'fieldtype': 'Data',
+		'idx': 12,
+		'label': 'Name',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'address_display',
+		'fieldtype': 'Small Text',
+		'idx': 13,
+		'label': 'Address',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_display',
+		'fieldtype': 'Small Text',
+		'idx': 14,
+		'label': 'Contact',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_mobile',
+		'fieldtype': 'Data',
+		'idx': 15,
+		'label': 'Mobile No',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_email',
+		'fieldtype': 'Data',
+		'idx': 16,
+		'label': 'Contact Email',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'territory',
+		'fieldtype': 'Link',
+		'idx': 17,
+		'in_filter': 1,
+		'label': 'Territory',
+		'oldfieldname': 'territory',
+		'oldfieldtype': 'Link',
+		'options': 'Territory',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_group',
+		'fieldtype': 'Link',
+		'idx': 18,
+		'label': 'Customer Group',
+		'options': 'Customer Group',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 19,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 20,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 21,
+		'label': 'Amended From',
+		'no_copy': 1,
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'hidden': 1,
+		'idx': 22,
+		'label': 'Amendment Date',
+		'no_copy': 1,
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 23,
+		'label': 'Issue Details',
+		'oldfieldtype': 'Section Break',
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'serial_no',
+		'fieldtype': 'Link',
+		'idx': 24,
+		'label': 'Serial No',
+		'options': 'Serial No',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 25,
+		'in_filter': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'reqd': 0,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:doc.item_code',
+		'doctype': 'DocField',
+		'fieldname': 'item_name',
+		'fieldtype': 'Data',
+		'idx': 26,
+		'label': 'Item Name',
+		'oldfieldname': 'item_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:doc.item_code',
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Small Text',
+		'idx': 27,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'complaint',
+		'fieldtype': 'Small Text',
+		'idx': 28,
+		'label': 'Issue',
+		'no_copy': 1,
+		'oldfieldname': 'complaint',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 29,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'warranty_amc_status',
+		'fieldtype': 'Select',
+		'hidden': 0,
+		'idx': 30,
+		'in_filter': 1,
+		'label': 'Warranty / AMC Status',
+		'options': '\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'warranty_expiry_date',
+		'fieldtype': 'Date',
+		'idx': 31,
+		'label': 'Warranty Expiry Date',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amc_expiry_date',
+		'fieldtype': 'Date',
+		'idx': 32,
+		'label': 'AMC Expiry Date',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'allocated_on',
+		'fieldtype': 'Date',
+		'idx': 33,
+		'in_filter': 1,
+		'label': 'Allocated On',
+		'oldfieldname': 'allocated_on',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'allocated_to',
+		'fieldtype': 'Link',
+		'idx': 34,
+		'in_filter': 1,
+		'label': 'Allocated To',
+		'oldfieldname': 'allocated_to',
+		'oldfieldtype': 'Link',
+		'options': 'Sales Person',
+		'permlevel': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 35,
+		'label': 'Resolution Detail',
+		'oldfieldtype': 'Section Break',
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'resolution_details',
+		'fieldtype': 'Text',
+		'idx': 36,
+		'label': 'Resolution Details',
+		'no_copy': 1,
+		'oldfieldname': 'resolution_details',
+		'oldfieldtype': 'Text',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 37,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'resolution_date',
+		'fieldtype': 'Date',
+		'idx': 38,
+		'in_filter': 1,
+		'label': 'Resolution Date',
+		'no_copy': 1,
+		'oldfieldname': 'resolution_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'resolved_by',
+		'fieldtype': 'Link',
+		'idx': 39,
+		'in_filter': 1,
+		'label': 'Resolved By',
+		'no_copy': 1,
+		'oldfieldname': 'resolved_by',
+		'oldfieldtype': 'Link',
+		'options': 'Sales Person',
+		'permlevel': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 0,
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.__islocal',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 40,
+		'label': 'Next Steps',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 41,
+		'label': 'Make Maintenance Visit',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/datewise_leave_report/__init__.py b/support/doctype/item_maintenance_detail/__init__.py
similarity index 100%
rename from payroll/search_criteria/datewise_leave_report/__init__.py
rename to support/doctype/item_maintenance_detail/__init__.py
diff --git a/support/doctype/item_maintenance_detail/item_maintenance_detail.txt b/support/doctype/item_maintenance_detail/item_maintenance_detail.txt
new file mode 100644
index 0000000000..ff5d211675
--- /dev/null
+++ b/support/doctype/item_maintenance_detail/item_maintenance_detail.txt
@@ -0,0 +1,184 @@
+# DocType, Item Maintenance Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:06',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'IMD.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Support',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 8
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Item Maintenance Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Item Maintenance Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Item Maintenance Detail'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'in_filter': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Item Name',
+		'oldfieldname': 'item_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'start_date',
+		'fieldtype': 'Date',
+		'idx': 4,
+		'in_filter': 1,
+		'label': 'Start Date',
+		'oldfieldname': 'start_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'end_date',
+		'fieldtype': 'Date',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'End Date',
+		'oldfieldname': 'end_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'periodicity',
+		'fieldtype': 'Select',
+		'idx': 6,
+		'label': 'Periodicity',
+		'oldfieldname': 'periodicity',
+		'oldfieldtype': 'Select',
+		'options': '\nWeekly\nMonthly\nQuarterly\nHalf Yearly\nYearly\nRandom',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'no_of_visits',
+		'fieldtype': 'Int',
+		'idx': 7,
+		'label': 'No of Visits',
+		'oldfieldname': 'no_of_visits',
+		'oldfieldtype': 'Int',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'incharge_name',
+		'fieldtype': 'Link',
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'Incharge Name',
+		'oldfieldname': 'incharge_name',
+		'oldfieldtype': 'Link',
+		'options': 'Sales Person',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'serial_no',
+		'fieldtype': 'Small Text',
+		'idx': 9,
+		'label': 'Serial No',
+		'oldfieldname': 'serial_no',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_docname',
+		'fieldtype': 'Data',
+		'idx': 10,
+		'in_filter': 1,
+		'label': 'Against Docname',
+		'no_copy': 1,
+		'oldfieldname': 'prevdoc_docname',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'search_index': 1,
+		'width': '150px'
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/datewise_leave_report1/__init__.py b/support/doctype/maintenance_schedule/__init__.py
similarity index 100%
rename from payroll/search_criteria/datewise_leave_report1/__init__.py
rename to support/doctype/maintenance_schedule/__init__.py
diff --git a/maintenance/doctype/maintenance_schedule/maintenance_schedule.js b/support/doctype/maintenance_schedule/maintenance_schedule.js
similarity index 100%
rename from maintenance/doctype/maintenance_schedule/maintenance_schedule.js
rename to support/doctype/maintenance_schedule/maintenance_schedule.js
diff --git a/maintenance/doctype/maintenance_schedule/maintenance_schedule.py b/support/doctype/maintenance_schedule/maintenance_schedule.py
similarity index 100%
rename from maintenance/doctype/maintenance_schedule/maintenance_schedule.py
rename to support/doctype/maintenance_schedule/maintenance_schedule.py
diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.txt b/support/doctype/maintenance_schedule/maintenance_schedule.txt
new file mode 100644
index 0000000000..3881aa3cc3
--- /dev/null
+++ b/support/doctype/maintenance_schedule/maintenance_schedule.txt
@@ -0,0 +1,419 @@
+# DocType, Maintenance Schedule
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:09',
+		'docstatus': 0,
+		'modified': '2011-05-17 17:13:43',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1305632624',
+		'autoname': 'MS.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'Support',
+		'name': '__common__',
+		'search_fields': 'status,customer,customer_name, sales_order_no',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 155
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Maintenance Schedule',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Maintenance Schedule',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Maintenance Schedule
+	{
+		'doctype': 'DocType',
+		'name': 'Maintenance Schedule'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'Maintenance Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'Maintenance Manager'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Customer Details',
+		'oldfieldtype': 'Section Break',
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 2,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Customer',
+		'oldfieldname': 'customer',
+		'oldfieldtype': 'Link',
+		'options': 'Customer',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_address',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'label': 'Customer Address',
+		'options': 'Address',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_person',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'label': 'Contact Person',
+		'options': 'Contact',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'customer_name',
+		'fieldtype': 'Data',
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Name',
+		'oldfieldname': 'customer_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'reqd': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'address_display',
+		'fieldtype': 'Small Text',
+		'idx': 7,
+		'label': 'Address',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_display',
+		'fieldtype': 'Small Text',
+		'idx': 8,
+		'label': 'Contact',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_mobile',
+		'fieldtype': 'Text',
+		'idx': 9,
+		'label': 'Mobile No',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_email',
+		'fieldtype': 'Text',
+		'idx': 10,
+		'label': 'Contact Email',
+		'permlevel': 1,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 11,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'transaction_date',
+		'fieldtype': 'Date',
+		'idx': 12,
+		'in_filter': 1,
+		'label': 'Transaction Date',
+		'oldfieldname': 'transaction_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Draft',
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Select',
+		'idx': 13,
+		'in_filter': 1,
+		'label': 'Status',
+		'no_copy': 1,
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Select',
+		'options': '\nDraft\nSubmitted\nCancelled',
+		'permlevel': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'idx': 14,
+		'label': 'Amended From',
+		'no_copy': 1,
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'hidden': 1,
+		'idx': 15,
+		'label': 'Amendment Date',
+		'no_copy': 1,
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Link',
+		'idx': 16,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Link',
+		'options': 'Company',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'territory',
+		'fieldtype': 'Link',
+		'idx': 17,
+		'in_filter': 1,
+		'label': 'Territory',
+		'oldfieldname': 'territory',
+		'oldfieldtype': 'Link',
+		'options': 'Territory',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_group',
+		'fieldtype': 'Link',
+		'idx': 18,
+		'label': 'Customer Group',
+		'options': 'Customer Group',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 19,
+		'label': 'Items',
+		'oldfieldtype': 'Section Break',
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'sales_order_no',
+		'fieldtype': 'Link',
+		'idx': 20,
+		'in_filter': 1,
+		'label': 'Sales Order No',
+		'oldfieldname': 'sales_order_no',
+		'oldfieldtype': 'Link',
+		'options': 'Sales Order',
+		'permlevel': 0,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 21,
+		'label': 'Get Items',
+		'oldfieldtype': 'Button',
+		'options': 'pull_sales_order_detail',
+		'permlevel': 0,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_maintenance_detail',
+		'fieldtype': 'Table',
+		'idx': 22,
+		'label': 'Item Maintenance Detail',
+		'oldfieldname': 'item_maintenance_detail',
+		'oldfieldtype': 'Table',
+		'options': 'Item Maintenance Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 23,
+		'label': 'Schedule',
+		'oldfieldtype': 'Section Break',
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 24,
+		'label': 'Generate Schedule',
+		'oldfieldtype': 'Button',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'maintenance_schedule_detail',
+		'fieldtype': 'Table',
+		'idx': 25,
+		'label': 'Maintenance Schedule Detail',
+		'oldfieldname': 'maintenance_schedule_detail',
+		'oldfieldtype': 'Table',
+		'options': 'Maintenance Schedule Detail',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/datewise_leave_report2/__init__.py b/support/doctype/maintenance_schedule_detail/__init__.py
similarity index 100%
rename from payroll/search_criteria/datewise_leave_report2/__init__.py
rename to support/doctype/maintenance_schedule_detail/__init__.py
diff --git a/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt b/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
new file mode 100644
index 0000000000..01cf7f093e
--- /dev/null
+++ b/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
@@ -0,0 +1,133 @@
+# DocType, Maintenance Schedule Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:09',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'MSD.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Support',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 12
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Maintenance Schedule Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Maintenance Schedule Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Maintenance Schedule Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 1,
+		'in_filter': 1,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 1,
+		'reqd': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'in_filter': 0,
+		'label': 'Item Name',
+		'oldfieldname': 'item_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'scheduled_date',
+		'fieldtype': 'Date',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Scheduled Date',
+		'oldfieldname': 'scheduled_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'actual_date',
+		'fieldtype': 'Date',
+		'hidden': 1,
+		'idx': 4,
+		'label': 'Actual Date',
+		'no_copy': 1,
+		'oldfieldname': 'actual_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'incharge_name',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'Incharge Name',
+		'oldfieldname': 'incharge_name',
+		'oldfieldtype': 'Link',
+		'options': 'Sales Person',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'serial_no',
+		'fieldtype': 'Small Text',
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Serial No',
+		'no_copy': 0,
+		'oldfieldname': 'serial_no',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1,
+		'search_index': 1,
+		'width': '160px'
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/employee_appraisals/__init__.py b/support/doctype/maintenance_visit/__init__.py
similarity index 100%
rename from payroll/search_criteria/employee_appraisals/__init__.py
rename to support/doctype/maintenance_visit/__init__.py
diff --git a/maintenance/doctype/maintenance_visit/maintenance_visit.js b/support/doctype/maintenance_visit/maintenance_visit.js
similarity index 100%
rename from maintenance/doctype/maintenance_visit/maintenance_visit.js
rename to support/doctype/maintenance_visit/maintenance_visit.js
diff --git a/maintenance/doctype/maintenance_visit/maintenance_visit.py b/support/doctype/maintenance_visit/maintenance_visit.py
similarity index 100%
rename from maintenance/doctype/maintenance_visit/maintenance_visit.py
rename to support/doctype/maintenance_visit/maintenance_visit.py
diff --git a/support/doctype/maintenance_visit/maintenance_visit.txt b/support/doctype/maintenance_visit/maintenance_visit.txt
new file mode 100644
index 0000000000..2485f57b41
--- /dev/null
+++ b/support/doctype/maintenance_visit/maintenance_visit.txt
@@ -0,0 +1,517 @@
+# DocType, Maintenance Visit
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:09',
+		'docstatus': 0,
+		'modified': '2011-07-01 11:20:38',
+		'modified_by': 'Administrator',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1305704021',
+		'autoname': 'MV.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'Support',
+		'name': '__common__',
+		'search_fields': 'status,maintenance_type,customer,customer_name, address,mntc_date,company,fiscal_year',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': 'To %(customer_name)s on %(mntc_date)s',
+		'tag_fields': 'completion_status,maintenance_type',
+		'version': 101
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Maintenance Visit',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Maintenance Visit',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Maintenance Visit
+	{
+		'doctype': 'DocType',
+		'name': 'Maintenance Visit'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1,
+		'role': 'System Manager'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'Maintenance Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'Maintenance Manager'
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 0,
+		'role': 'Maintenance User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 1,
+		'role': 'Maintenance User'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Customer Details',
+		'oldfieldtype': 'Section Break',
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 2,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Customer',
+		'oldfieldname': 'customer',
+		'oldfieldtype': 'Link',
+		'options': 'Customer',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_address',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'label': 'Customer Address',
+		'options': 'Address',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_person',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'label': 'Contact Person',
+		'options': 'Contact',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_name',
+		'fieldtype': 'Data',
+		'idx': 6,
+		'label': 'Name',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'address_display',
+		'fieldtype': 'Small Text',
+		'idx': 7,
+		'label': 'Address',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_display',
+		'fieldtype': 'Small Text',
+		'idx': 8,
+		'label': 'Contact',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_mobile',
+		'fieldtype': 'Data',
+		'idx': 9,
+		'label': 'Mobile No',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_email',
+		'fieldtype': 'Data',
+		'idx': 10,
+		'label': 'Contact Email',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Select',
+		'idx': 11,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'oldfieldtype': 'Select',
+		'options': 'link:Company',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'fieldtype': 'Select',
+		'idx': 12,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'oldfieldtype': 'Select',
+		'options': 'link:Fiscal Year',
+		'permlevel': 0,
+		'print_hide': 1,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 13,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'default': 'Today',
+		'doctype': 'DocField',
+		'fieldname': 'mntc_date',
+		'fieldtype': 'Date',
+		'idx': 14,
+		'label': 'Maintenance Date',
+		'no_copy': 1,
+		'oldfieldname': 'mntc_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'mntc_time',
+		'fieldtype': 'Time',
+		'idx': 15,
+		'label': 'Maintenance Time',
+		'no_copy': 1,
+		'oldfieldname': 'mntc_time',
+		'oldfieldtype': 'Time',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Draft',
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Data',
+		'idx': 16,
+		'label': 'Status',
+		'no_copy': 1,
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Data',
+		'options': '\nDraft\nCancelled\nSubmitted',
+		'permlevel': 1,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amended_from',
+		'fieldtype': 'Data',
+		'idx': 17,
+		'label': 'Amended From',
+		'no_copy': 1,
+		'oldfieldname': 'amended_from',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'width': '150px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'amendment_date',
+		'fieldtype': 'Date',
+		'idx': 18,
+		'label': 'Amendment Date',
+		'no_copy': 1,
+		'oldfieldname': 'amendment_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 0,
+		'print_hide': 1,
+		'width': '100px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'territory',
+		'fieldtype': 'Link',
+		'idx': 19,
+		'label': 'Territory',
+		'options': 'Territory',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_group',
+		'fieldtype': 'Link',
+		'idx': 20,
+		'label': 'Customer Group',
+		'options': 'Customer Group',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 21,
+		'label': 'Maintenance Details',
+		'oldfieldtype': 'Section Break',
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'completion_status',
+		'fieldtype': 'Select',
+		'idx': 22,
+		'label': 'Completion Status',
+		'oldfieldname': 'completion_status',
+		'oldfieldtype': 'Select',
+		'options': '\nPartially Completed\nFully Completed',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Unscheduled',
+		'doctype': 'DocField',
+		'fieldname': 'maintenance_type',
+		'fieldtype': 'Select',
+		'idx': 23,
+		'in_filter': 1,
+		'label': 'Maintenance Type',
+		'oldfieldname': 'maintenance_type',
+		'oldfieldtype': 'Select',
+		'options': '\nScheduled\nUnscheduled\nBreakdown',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 24,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'sales_order_no',
+		'fieldtype': 'Link',
+		'idx': 25,
+		'in_filter': 1,
+		'label': 'Sales Order No',
+		'oldfieldname': 'sales_order_no',
+		'oldfieldtype': 'Link',
+		'options': 'Sales Order',
+		'permlevel': 0,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'customer_issue_no',
+		'fieldtype': 'Link',
+		'idx': 26,
+		'in_filter': 1,
+		'label': 'Customer Issue No',
+		'oldfieldname': 'customer_issue_no',
+		'oldfieldtype': 'Link',
+		'options': 'Customer Issue',
+		'permlevel': 0,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 27,
+		'label': 'Get Items',
+		'oldfieldtype': 'Button',
+		'options': 'fetch_items',
+		'permlevel': 0,
+		'print_hide': 1,
+		'report_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 28,
+		'oldfieldtype': 'Section Break',
+		'options': 'Simple',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'maintenance_visit_details',
+		'fieldtype': 'Table',
+		'idx': 29,
+		'label': 'Maintenance Visit Detail',
+		'oldfieldname': 'maintenance_visit_details',
+		'oldfieldtype': 'Table',
+		'options': 'Maintenance Visit Detail',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 30,
+		'label': 'Feedback',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_feedback',
+		'fieldtype': 'Small Text',
+		'idx': 31,
+		'label': 'Customer Feedback',
+		'oldfieldname': 'customer_feedback',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/employee_details/__init__.py b/support/doctype/maintenance_visit_detail/__init__.py
similarity index 100%
rename from payroll/search_criteria/employee_details/__init__.py
rename to support/doctype/maintenance_visit_detail/__init__.py
diff --git a/support/doctype/maintenance_visit_detail/maintenance_visit_detail.txt b/support/doctype/maintenance_visit_detail/maintenance_visit_detail.txt
new file mode 100644
index 0000000000..df72e476b2
--- /dev/null
+++ b/support/doctype/maintenance_visit_detail/maintenance_visit_detail.txt
@@ -0,0 +1,172 @@
+# DocType, Maintenance Visit Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:09',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'MVD.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Support',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 13
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Maintenance Visit Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# DocType, Maintenance Visit Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Maintenance Visit Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Small Text',
+		'idx': 1,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'reqd': 1,
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'service_person',
+		'fieldtype': 'Link',
+		'idx': 2,
+		'label': 'Service Person',
+		'oldfieldname': 'service_person',
+		'oldfieldtype': 'Link',
+		'options': 'Sales Person',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'work_done',
+		'fieldtype': 'Small Text',
+		'idx': 3,
+		'label': 'Work Done',
+		'oldfieldname': 'work_done',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'item_code',
+		'fieldtype': 'Link',
+		'idx': 4,
+		'label': 'Item Code',
+		'oldfieldname': 'item_code',
+		'oldfieldtype': 'Link',
+		'options': 'Item',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'item_name',
+		'fieldtype': 'Data',
+		'idx': 5,
+		'label': 'Item Name',
+		'oldfieldname': 'item_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'serial_no',
+		'fieldtype': 'Small Text',
+		'idx': 6,
+		'label': 'Serial No',
+		'oldfieldname': 'serial_no',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_docname',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 7,
+		'label': 'Against Document No',
+		'no_copy': 1,
+		'oldfieldname': 'prevdoc_docname',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 1,
+		'width': '160px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_detail_docname',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 8,
+		'label': 'Against Document Detail No',
+		'no_copy': 1,
+		'oldfieldname': 'prevdoc_detail_docname',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 1,
+		'width': '160px'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'prevdoc_doctype',
+		'fieldtype': 'Data',
+		'hidden': 0,
+		'idx': 9,
+		'label': 'Document Type',
+		'no_copy': 1,
+		'oldfieldname': 'prevdoc_doctype',
+		'oldfieldtype': 'Data',
+		'permlevel': 1,
+		'print_hide': 1,
+		'report_hide': 1,
+		'width': '150px'
+	}
+]
\ No newline at end of file
diff --git a/maintenance/doctype/support_ticket/__init__.py b/support/doctype/support_ticket/__init__.py
similarity index 100%
rename from maintenance/doctype/support_ticket/__init__.py
rename to support/doctype/support_ticket/__init__.py
diff --git a/maintenance/doctype/support_ticket/support_ticket.js b/support/doctype/support_ticket/support_ticket.js
similarity index 100%
rename from maintenance/doctype/support_ticket/support_ticket.js
rename to support/doctype/support_ticket/support_ticket.js
diff --git a/maintenance/doctype/support_ticket/support_ticket.py b/support/doctype/support_ticket/support_ticket.py
similarity index 100%
rename from maintenance/doctype/support_ticket/support_ticket.py
rename to support/doctype/support_ticket/support_ticket.py
diff --git a/support/doctype/support_ticket/support_ticket.txt b/support/doctype/support_ticket/support_ticket.txt
new file mode 100644
index 0000000000..57d3b3b5ee
--- /dev/null
+++ b/support/doctype/support_ticket/support_ticket.txt
@@ -0,0 +1,419 @@
+# DocType, Support Ticket
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2011-05-23 14:50:46',
+		'docstatus': 0,
+		'modified': '2011-06-27 10:46:31',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308898257',
+		'allow_trash': 1,
+		'autoname': 'SUP.######',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'Support',
+		'name': '__common__',
+		'search_fields': 'status,customer,allocated_to,subject,raised_by',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': '%(subject)s',
+		'tag_fields': 'status',
+		'version': 140
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Support Ticket',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Support Ticket',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Support Ticket
+	{
+		'doctype': 'DocType',
+		'name': 'Support Ticket'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'Guest',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'match': 'customer',
+		'permlevel': 0,
+		'role': 'Customer',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'Support Team',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'match': 'allocated_to',
+		'permlevel': 1,
+		'role': 'Support Team',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 2,
+		'role': 'Support Team'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': 'Open',
+		'doctype': 'DocField',
+		'fieldname': 'status',
+		'fieldtype': 'Select',
+		'idx': 1,
+		'in_filter': 0,
+		'label': 'Status',
+		'no_copy': 1,
+		'oldfieldname': 'status',
+		'oldfieldtype': 'Select',
+		'options': '\nOpen\nTo Reply\nWaiting for Customer\nHold\nClosed',
+		'permlevel': 1,
+		'reqd': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'subject',
+		'fieldtype': 'Text',
+		'idx': 2,
+		'in_filter': 1,
+		'label': 'Subject',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'depends_on': 'eval:doc.__islocal',
+		'doctype': 'DocField',
+		'fieldname': 'raised_by',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'in_filter': 1,
+		'label': 'Raised By (Email)',
+		'oldfieldname': 'raised_by',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'depends_on': 'eval:doc.__islocal',
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 4,
+		'label': 'Description',
+		'oldfieldname': 'problem_description',
+		'oldfieldtype': 'Text',
+		'permlevel': 0,
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'problem_description',
+		'fieldtype': 'Text',
+		'idx': 5,
+		'label': 'Problem Description',
+		'oldfieldname': 'problem_description',
+		'oldfieldtype': 'Text',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'depends_on': 'eval:!doc.__islocal',
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'idx': 6,
+		'label': 'Thread HTML',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'depends_on': 'eval:!doc.__islocal',
+		'doctype': 'DocField',
+		'fieldname': 'new_response',
+		'fieldtype': 'Text',
+		'idx': 7,
+		'label': 'New Response',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'depends_on': 'eval:!doc.__islocal',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 8,
+		'label': 'Send',
+		'options': 'send_response',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 9,
+		'label': 'Additional Info',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'depends_on': 'eval:!doc.__islocal',
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 10,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 1,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'customer',
+		'fieldtype': 'Link',
+		'idx': 11,
+		'in_filter': 1,
+		'label': 'Customer',
+		'oldfieldname': 'customer',
+		'oldfieldtype': 'Link',
+		'options': 'Customer',
+		'permlevel': 1,
+		'print_hide': 1,
+		'reqd': 0,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_name',
+		'fieldtype': 'Data',
+		'idx': 12,
+		'in_filter': 1,
+		'label': 'Customer Name',
+		'oldfieldname': 'customer_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 2,
+		'reqd': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'address_display',
+		'fieldtype': 'Small Text',
+		'idx': 13,
+		'label': 'Address',
+		'permlevel': 2
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_display',
+		'fieldtype': 'Data',
+		'idx': 14,
+		'label': 'Contact Name',
+		'permlevel': 2
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_mobile',
+		'fieldtype': 'Data',
+		'idx': 15,
+		'label': 'Mobile No',
+		'permlevel': 2
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_email',
+		'fieldtype': 'Data',
+		'idx': 16,
+		'label': 'Contact Email',
+		'oldfieldname': 'contact_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 2
+	},
+
+	# DocField
+	{
+		'default': 'Today',
+		'doctype': 'DocField',
+		'fieldname': 'opening_date',
+		'fieldtype': 'Date',
+		'idx': 17,
+		'label': 'Opening Date',
+		'no_copy': 1,
+		'oldfieldname': 'opening_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'opening_time',
+		'fieldtype': 'Time',
+		'idx': 18,
+		'label': 'Opening Time',
+		'no_copy': 1,
+		'oldfieldname': 'opening_time',
+		'oldfieldtype': 'Time',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'depends_on': 'eval:!doc.__islocal',
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 19,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'depends_on': 'eval:!doc.__islocal',
+		'doctype': 'DocField',
+		'fieldname': 'allocated_to',
+		'fieldtype': 'Link',
+		'idx': 20,
+		'in_filter': 1,
+		'label': 'Allocated To',
+		'oldfieldname': 'allocated_to',
+		'oldfieldtype': 'Link',
+		'options': 'Profile',
+		'permlevel': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'depends_on': 'eval:!doc.__islocal',
+		'doctype': 'DocField',
+		'fieldname': 'resolution_details',
+		'fieldtype': 'Text',
+		'idx': 21,
+		'label': 'Resolution Details',
+		'no_copy': 1,
+		'oldfieldname': 'resolution_details',
+		'oldfieldtype': 'Text',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'depends_on': 'eval:!doc.__islocal',
+		'doctype': 'DocField',
+		'fieldname': 'resolution_date',
+		'fieldtype': 'Date',
+		'idx': 22,
+		'in_filter': 0,
+		'label': 'Resolution Date',
+		'no_copy': 1,
+		'oldfieldname': 'resolution_date',
+		'oldfieldtype': 'Date',
+		'permlevel': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'depends_on': 'eval:!doc.__islocal',
+		'doctype': 'DocField',
+		'fieldname': 'resolution_time',
+		'fieldtype': 'Time',
+		'idx': 23,
+		'label': 'Resolution Time',
+		'oldfieldname': 'resolution_time',
+		'oldfieldtype': 'Time',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'content_type',
+		'fieldtype': 'Data',
+		'hidden': 1,
+		'idx': 24,
+		'label': 'Content Type',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/employee_details1/__init__.py b/support/doctype/support_ticket_response/__init__.py
similarity index 100%
rename from payroll/search_criteria/employee_details1/__init__.py
rename to support/doctype/support_ticket_response/__init__.py
diff --git a/support/doctype/support_ticket_response/support_ticket_response.txt b/support/doctype/support_ticket_response/support_ticket_response.txt
new file mode 100644
index 0000000000..036601fbbb
--- /dev/null
+++ b/support/doctype/support_ticket_response/support_ticket_response.txt
@@ -0,0 +1,67 @@
+# DocType, Support Ticket Response
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2011-05-23 14:50:48',
+		'docstatus': 0,
+		'modified': '2011-05-24 10:17:30',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Support',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'version': 4
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Support Ticket Response',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Support Ticket Response
+	{
+		'doctype': 'DocType',
+		'name': 'Support Ticket Response'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'mail',
+		'fieldtype': 'Text',
+		'idx': 1,
+		'label': 'Mail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'from_email',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'From Email'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'content_type',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Content Type'
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/employee_details2/__init__.py b/support/search_criteria/__init__.py
similarity index 100%
rename from payroll/search_criteria/employee_details2/__init__.py
rename to support/search_criteria/__init__.py
diff --git a/payroll/search_criteria/employee_in_company_experience/__init__.py b/support/search_criteria/amc_summary/__init__.py
similarity index 100%
rename from payroll/search_criteria/employee_in_company_experience/__init__.py
rename to support/search_criteria/amc_summary/__init__.py
diff --git a/maintenance/search_criteria/amc_summary/amc_summary.js b/support/search_criteria/amc_summary/amc_summary.js
similarity index 100%
rename from maintenance/search_criteria/amc_summary/amc_summary.js
rename to support/search_criteria/amc_summary/amc_summary.js
diff --git a/maintenance/search_criteria/amc_summary/amc_summary.py b/support/search_criteria/amc_summary/amc_summary.py
similarity index 100%
rename from maintenance/search_criteria/amc_summary/amc_summary.py
rename to support/search_criteria/amc_summary/amc_summary.py
diff --git a/maintenance/search_criteria/amc_summary/amc_summary.txt b/support/search_criteria/amc_summary/amc_summary.txt
similarity index 100%
rename from maintenance/search_criteria/amc_summary/amc_summary.txt
rename to support/search_criteria/amc_summary/amc_summary.txt
diff --git a/payroll/search_criteria/employee_in_company_experience1/__init__.py b/support/search_criteria/customer_issues/__init__.py
similarity index 100%
rename from payroll/search_criteria/employee_in_company_experience1/__init__.py
rename to support/search_criteria/customer_issues/__init__.py
diff --git a/maintenance/search_criteria/customer_issues/customer_issues.js b/support/search_criteria/customer_issues/customer_issues.js
similarity index 100%
rename from maintenance/search_criteria/customer_issues/customer_issues.js
rename to support/search_criteria/customer_issues/customer_issues.js
diff --git a/maintenance/search_criteria/customer_issues/customer_issues.txt b/support/search_criteria/customer_issues/customer_issues.txt
similarity index 100%
rename from maintenance/search_criteria/customer_issues/customer_issues.txt
rename to support/search_criteria/customer_issues/customer_issues.txt
diff --git a/payroll/search_criteria/employee_in_company_experience2/__init__.py b/support/search_criteria/maintenance_orderwise_pending_amount_to_bill/__init__.py
similarity index 100%
rename from payroll/search_criteria/employee_in_company_experience2/__init__.py
rename to support/search_criteria/maintenance_orderwise_pending_amount_to_bill/__init__.py
diff --git a/maintenance/search_criteria/maintenance_orderwise_pending_amount_to_bill/maintenance_orderwise_pending_amount_to_bill.js b/support/search_criteria/maintenance_orderwise_pending_amount_to_bill/maintenance_orderwise_pending_amount_to_bill.js
similarity index 100%
rename from maintenance/search_criteria/maintenance_orderwise_pending_amount_to_bill/maintenance_orderwise_pending_amount_to_bill.js
rename to support/search_criteria/maintenance_orderwise_pending_amount_to_bill/maintenance_orderwise_pending_amount_to_bill.js
diff --git a/maintenance/search_criteria/maintenance_orderwise_pending_amount_to_bill/maintenance_orderwise_pending_amount_to_bill.txt b/support/search_criteria/maintenance_orderwise_pending_amount_to_bill/maintenance_orderwise_pending_amount_to_bill.txt
similarity index 100%
rename from maintenance/search_criteria/maintenance_orderwise_pending_amount_to_bill/maintenance_orderwise_pending_amount_to_bill.txt
rename to support/search_criteria/maintenance_orderwise_pending_amount_to_bill/maintenance_orderwise_pending_amount_to_bill.txt
diff --git a/payroll/search_criteria/employee_information/__init__.py b/support/search_criteria/maintenance_schedule_details/__init__.py
similarity index 100%
rename from payroll/search_criteria/employee_information/__init__.py
rename to support/search_criteria/maintenance_schedule_details/__init__.py
diff --git a/maintenance/search_criteria/maintenance_schedule_details/maintenance_schedule_details.js b/support/search_criteria/maintenance_schedule_details/maintenance_schedule_details.js
similarity index 100%
rename from maintenance/search_criteria/maintenance_schedule_details/maintenance_schedule_details.js
rename to support/search_criteria/maintenance_schedule_details/maintenance_schedule_details.js
diff --git a/maintenance/search_criteria/maintenance_schedule_details/maintenance_schedule_details.txt b/support/search_criteria/maintenance_schedule_details/maintenance_schedule_details.txt
similarity index 100%
rename from maintenance/search_criteria/maintenance_schedule_details/maintenance_schedule_details.txt
rename to support/search_criteria/maintenance_schedule_details/maintenance_schedule_details.txt
diff --git a/payroll/search_criteria/employees_birthday/__init__.py b/support/search_criteria/warranty_amc_expiry_details/__init__.py
similarity index 100%
rename from payroll/search_criteria/employees_birthday/__init__.py
rename to support/search_criteria/warranty_amc_expiry_details/__init__.py
diff --git a/maintenance/search_criteria/warranty_amc_expiry_details/warranty_amc_expiry_details.js b/support/search_criteria/warranty_amc_expiry_details/warranty_amc_expiry_details.js
similarity index 100%
rename from maintenance/search_criteria/warranty_amc_expiry_details/warranty_amc_expiry_details.js
rename to support/search_criteria/warranty_amc_expiry_details/warranty_amc_expiry_details.js
diff --git a/maintenance/search_criteria/warranty_amc_expiry_details/warranty_amc_expiry_details.txt b/support/search_criteria/warranty_amc_expiry_details/warranty_amc_expiry_details.txt
similarity index 100%
rename from maintenance/search_criteria/warranty_amc_expiry_details/warranty_amc_expiry_details.txt
rename to support/search_criteria/warranty_amc_expiry_details/warranty_amc_expiry_details.txt
diff --git a/payroll/search_criteria/employees_birthday1/__init__.py b/support/search_criteria/warranty_amc_summary/__init__.py
similarity index 100%
rename from payroll/search_criteria/employees_birthday1/__init__.py
rename to support/search_criteria/warranty_amc_summary/__init__.py
diff --git a/maintenance/search_criteria/warranty_amc_summary/warranty_amc_summary.js b/support/search_criteria/warranty_amc_summary/warranty_amc_summary.js
similarity index 100%
rename from maintenance/search_criteria/warranty_amc_summary/warranty_amc_summary.js
rename to support/search_criteria/warranty_amc_summary/warranty_amc_summary.js
diff --git a/maintenance/search_criteria/warranty_amc_summary/warranty_amc_summary.py b/support/search_criteria/warranty_amc_summary/warranty_amc_summary.py
similarity index 100%
rename from maintenance/search_criteria/warranty_amc_summary/warranty_amc_summary.py
rename to support/search_criteria/warranty_amc_summary/warranty_amc_summary.py
diff --git a/maintenance/search_criteria/warranty_amc_summary/warranty_amc_summary.sql b/support/search_criteria/warranty_amc_summary/warranty_amc_summary.sql
similarity index 100%
rename from maintenance/search_criteria/warranty_amc_summary/warranty_amc_summary.sql
rename to support/search_criteria/warranty_amc_summary/warranty_amc_summary.sql
diff --git a/maintenance/search_criteria/warranty_amc_summary/warranty_amc_summary.txt b/support/search_criteria/warranty_amc_summary/warranty_amc_summary.txt
similarity index 100%
rename from maintenance/search_criteria/warranty_amc_summary/warranty_amc_summary.txt
rename to support/search_criteria/warranty_amc_summary/warranty_amc_summary.txt
diff --git a/tools/Module Def/Tools/Tools.txt b/tools/Module Def/Tools/Tools.txt
deleted file mode 100644
index 428f079cdf..0000000000
--- a/tools/Module Def/Tools/Tools.txt	
+++ /dev/null
@@ -1,358 +0,0 @@
-[
-	{
-		'_last_update': None,
-		'creation': '2010-11-30 22:45:03',
-		'disabled': 'Yes',
-		'docstatus': 0,
-		'doctype': 'Module Def',
-		'doctype_list': None,
-		'file_list': None,
-		'idx': None,
-		'is_hidden': None,
-		'last_updated_date': '2011-02-12 11:57:57',
-		'modified': '2010-09-25 00:00:00',
-		'modified_by': 'Administrator',
-		'module_desc': None,
-		'module_icon': 'id_card.png',
-		'module_label': 'Organize',
-		'module_name': 'Tools',
-		'module_page': 'Organize',
-		'module_seq': 3,
-		'name': 'Tools',
-		'owner': 'Administrator',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
-		'trash_reason': None,
-		'widget_code': None
-	},
-	{
-		'click_function': None,
-		'creation': '2010-11-30 22:45:03',
-		'description': 'Shared Calendar of important events, reminders',
-		'display_name': 'Calendar',
-		'doc_name': '_calendar',
-		'doc_type': 'Pages',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': 'calendar.gif',
-		'idx': 1,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': 'MDI00252',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2010-11-30 22:45:03',
-		'description': 'Manage your contact details',
-		'display_name': 'Manage Contacts',
-		'doc_name': 'Contact Page',
-		'doc_type': 'Pages',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': 'table.gif',
-		'idx': 2,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': 'MDI00253',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2010-11-30 22:45:03',
-		'description': 'Standardized business letters',
-		'display_name': 'Business Letters',
-		'doc_name': 'Business Letter',
-		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': 'to_contact\ntemplate',
-		'hide': None,
-		'icon': 'page.gif',
-		'idx': 3,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': 'MDI00254',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2010-11-30 22:45:03',
-		'description': 'Online storage of files in a folder structure that you can share with your users',
-		'display_name': 'File Uploads',
-		'doc_name': 'File Browser',
-		'doc_type': 'Pages',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': 'folder.gif',
-		'idx': 4,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': 'MDI00255',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'click_function': None,
-		'creation': '2010-11-30 22:45:03',
-		'description': None,
-		'display_name': 'SMS Center',
-		'doc_name': 'SMS Center',
-		'doc_type': 'Single DocType',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 5,
-		'modified': '2011-03-24 15:04:47',
-		'modified_by': 'Administrator',
-		'name': 'MDI00256',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
-	},
-	{
-		'creation': '2010-11-30 22:45:03',
-		'docstatus': 0,
-		'doctype': 'Module Def Role',
-		'idx': 1,
-		'modified': '2010-11-30 22:45:03',
-		'modified_by': 'Administrator',
-		'name': 'MDR00059',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
-		'role': 'Accounts User'
-	},
-	{
-		'creation': '2010-11-30 22:45:03',
-		'docstatus': 0,
-		'doctype': 'Module Def Role',
-		'idx': 2,
-		'modified': '2010-11-30 22:45:03',
-		'modified_by': 'Administrator',
-		'name': 'MDR00060',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
-		'role': 'Accounts Manager'
-	},
-	{
-		'creation': '2010-11-30 22:45:03',
-		'docstatus': 0,
-		'doctype': 'Module Def Role',
-		'idx': 3,
-		'modified': '2010-11-30 22:45:03',
-		'modified_by': 'Administrator',
-		'name': 'MDR00061',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
-		'role': 'HR User'
-	},
-	{
-		'creation': '2010-11-30 22:45:03',
-		'docstatus': 0,
-		'doctype': 'Module Def Role',
-		'idx': 4,
-		'modified': '2010-11-30 22:45:03',
-		'modified_by': 'Administrator',
-		'name': 'MDR00062',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
-		'role': 'HR Manager'
-	},
-	{
-		'creation': '2010-11-30 22:45:03',
-		'docstatus': 0,
-		'doctype': 'Module Def Role',
-		'idx': 5,
-		'modified': '2010-11-30 22:45:03',
-		'modified_by': 'Administrator',
-		'name': 'MDR00063',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
-		'role': 'Material User'
-	},
-	{
-		'creation': '2010-11-30 22:45:03',
-		'docstatus': 0,
-		'doctype': 'Module Def Role',
-		'idx': 6,
-		'modified': '2010-11-30 22:45:03',
-		'modified_by': 'Administrator',
-		'name': 'MDR00064',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
-		'role': 'Material Master Manager'
-	},
-	{
-		'creation': '2010-11-30 22:45:03',
-		'docstatus': 0,
-		'doctype': 'Module Def Role',
-		'idx': 7,
-		'modified': '2010-11-30 22:45:03',
-		'modified_by': 'Administrator',
-		'name': 'MDR00065',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
-		'role': 'Material Manager'
-	},
-	{
-		'creation': '2010-11-30 22:45:03',
-		'docstatus': 0,
-		'doctype': 'Module Def Role',
-		'idx': 8,
-		'modified': '2010-11-30 22:45:03',
-		'modified_by': 'Administrator',
-		'name': 'MDR00066',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
-		'role': 'Purchase User'
-	},
-	{
-		'creation': '2010-11-30 22:45:03',
-		'docstatus': 0,
-		'doctype': 'Module Def Role',
-		'idx': 9,
-		'modified': '2010-11-30 22:45:03',
-		'modified_by': 'Administrator',
-		'name': 'MDR00067',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
-		'role': 'Purchase Master Manager'
-	},
-	{
-		'creation': '2010-11-30 22:45:03',
-		'docstatus': 0,
-		'doctype': 'Module Def Role',
-		'idx': 10,
-		'modified': '2010-11-30 22:45:03',
-		'modified_by': 'Administrator',
-		'name': 'MDR00068',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
-		'role': 'Purchase Manager'
-	},
-	{
-		'creation': '2010-11-30 22:45:03',
-		'docstatus': 0,
-		'doctype': 'Module Def Role',
-		'idx': 11,
-		'modified': '2010-11-30 22:45:03',
-		'modified_by': 'Administrator',
-		'name': 'MDR00069',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
-		'role': 'Production User'
-	},
-	{
-		'creation': '2010-11-30 22:45:03',
-		'docstatus': 0,
-		'doctype': 'Module Def Role',
-		'idx': 12,
-		'modified': '2010-11-30 22:45:03',
-		'modified_by': 'Administrator',
-		'name': 'MDR00070',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
-		'role': 'Production Manager'
-	},
-	{
-		'creation': '2010-11-30 22:45:03',
-		'docstatus': 0,
-		'doctype': 'Module Def Role',
-		'idx': 13,
-		'modified': '2010-11-30 22:45:03',
-		'modified_by': 'Administrator',
-		'name': 'MDR00071',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
-		'role': 'System Manager'
-	},
-	{
-		'creation': '2010-11-30 22:45:03',
-		'docstatus': 0,
-		'doctype': 'Module Def Role',
-		'idx': 14,
-		'modified': '2010-11-30 22:45:03',
-		'modified_by': 'Administrator',
-		'name': 'MDR00072',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
-		'role': 'Sales User'
-	},
-	{
-		'creation': '2010-11-30 22:45:03',
-		'docstatus': 0,
-		'doctype': 'Module Def Role',
-		'idx': 15,
-		'modified': '2010-11-30 22:45:03',
-		'modified_by': 'Administrator',
-		'name': 'MDR00073',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
-		'role': 'Sales Master Manager'
-	},
-	{
-		'creation': '2010-11-30 22:45:03',
-		'docstatus': 0,
-		'doctype': 'Module Def Role',
-		'idx': 16,
-		'modified': '2010-11-30 22:45:03',
-		'modified_by': 'Administrator',
-		'name': 'MDR00074',
-		'owner': 'Administrator',
-		'parent': 'Tools',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
-		'role': 'Sales Manager'
-	}
-]
\ No newline at end of file
diff --git a/tools/__init__.py b/tools/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/__init__.py b/tools/doctype/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/activity_dashboard_control/__init__.py b/tools/doctype/activity_dashboard_control/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/activity_dashboard_control/activity_dashboard_control.txt b/tools/doctype/activity_dashboard_control/activity_dashboard_control.txt
deleted file mode 100644
index e55656d6b6..0000000000
--- a/tools/doctype/activity_dashboard_control/activity_dashboard_control.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-29 14:44:17', 'search_fields': None, 'module': 'Tools', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 43, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'nabin@webnotestech.com', 'document_type': None, 'name': 'Activity Dashboard Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/tools/doctype/address/__init__.py b/tools/doctype/address/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/address/address.txt b/tools/doctype/address/address.txt
deleted file mode 100644
index ee23f8215d..0000000000
--- a/tools/doctype/address/address.txt
+++ /dev/null
@@ -1,802 +0,0 @@
-[
-	{
-		'_last_update': '1306307668',
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': 1,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:59:30',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': 1,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'module': 'Tools',
-		'name': 'Address',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': None,
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
-		'version': 41
-	},
-	{
-		'amend': None,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-05-25 12:59:30',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'PERM00884',
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'All',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:59:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Address Details',
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05072',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:59:30',
-		'default': None,
-		'depends_on': None,
-		'description': 'e.g. Office, Billing, Shipping',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'address_type',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Address Type',
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05073',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:59:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'address_line1',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'Address Line1',
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05074',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:59:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'address_line2',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Address Line2',
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05075',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:59:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'city',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': 1,
-		'label': 'City/Town',
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05076',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Suggest',
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:59:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'pincode',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': 1,
-		'label': 'Pincode',
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05077',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 1,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:59:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'country',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': 1,
-		'label': 'Country',
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05078',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'link:Country',
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': 1,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:59:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'state',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': 1,
-		'label': 'State',
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05079',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Suggest',
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': 0,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:59:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05080',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:59:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'phone',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Phone',
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05081',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:59:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'email_id',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': 'Email Id',
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05082',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:59:30',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'fax',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Fax',
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05083',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:59:30',
-		'default': None,
-		'depends_on': 'eval:!doc.supplier && !doc.sales_partner',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Customer',
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05084',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Customer',
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:59:31',
-		'default': None,
-		'depends_on': 'eval:!doc.supplier && !doc.sales_partner',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Customer Name',
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05085',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:59:31',
-		'default': None,
-		'depends_on': 'eval:!doc.customer && !doc.sales_partner',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Supplier',
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05086',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Supplier',
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:59:31',
-		'default': None,
-		'depends_on': 'eval:!doc.customer && !doc.sales_partner',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': 'Supplier Name',
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05087',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:59:31',
-		'default': None,
-		'depends_on': 'eval:!doc.customer && !doc.supplier',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'sales_partner',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Sales Partner',
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05088',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Sales Partner',
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:59:31',
-		'default': '0',
-		'depends_on': None,
-		'description': 'Check to make primary address',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_primary_address',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 18,
-		'in_filter': None,
-		'label': 'Is Primary Address',
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05089',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-25 12:59:31',
-		'default': '0',
-		'depends_on': None,
-		'description': 'Check to make Shipping Address',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_shipping_address',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 19,
-		'in_filter': None,
-		'label': 'Is Shipping Address',
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05090',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-25 12:59:31',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'trash_reason',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'Trash Reason',
-		'modified': '2011-05-26 17:45:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05091',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Address',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/tools/doctype/business_letter/__init__.py b/tools/doctype/business_letter/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/business_letter/business_letter.js b/tools/doctype/business_letter/business_letter.js
deleted file mode 100644
index 35abc0f514..0000000000
--- a/tools/doctype/business_letter/business_letter.js
+++ /dev/null
@@ -1,38 +0,0 @@
-$import(Tips Common)
-
-cur_frm.fields_dict['template'].get_query=function(doc,cdt,cdn){
-  return "SELECT `tabBusiness Letter Template`.name FROM `tabBusiness Letter Template` WHERE `tabBusiness Letter Template`.letter_type='"+doc.letter_type+"' AND `tabBusiness Letter Template`.name like '%s' LIMIT 50"
-}
-
-cur_frm.cscript.template = function(doc,cdt,cdn){
-  //set title as like template
-  doc.title = doc.template;
-  refresh_field('title');
-
-  //set print heading as title 
-  cur_frm.pformat.print_heading=doc.title;
-  cur_frm.pformat.print_subheading = ' ';
-
-  //call set_content function to pull content as per template selected
-  $c_obj([doc], 'set_content', '',function(r, rt) { refresh_field('content');});
-}
-
-cur_frm.cscript.title= function(doc,cdt,cdn){
-  //set print heading on title change
-  cur_frm.pformat.print_heading=doc.title;
-  cur_frm.pformat.print_subheading = ' ';
-}
-
-cur_frm.cscript.refresh= function(doc,cdt,cdn){
-  cur_frm.cscript.get_tips(doc, cdt, cdn);
-  //set print heading on refresh
-  cur_frm.pformat.print_heading=doc.title;
-  cur_frm.pformat.print_subheading = ' ';
-}
-
-cur_frm.cscript.onload= function(doc,cdt,cdn){
-  cur_frm.cscript.get_tips(doc, cdt, cdn);
-  //set print heading
-  cur_frm.pformat.print_heading=doc.title;
-  cur_frm.pformat.print_subheading = ' ';
-}
diff --git a/tools/doctype/business_letter/business_letter.py b/tools/doctype/business_letter/business_letter.py
deleted file mode 100644
index 47de45c592..0000000000
--- a/tools/doctype/business_letter/business_letter.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Please edit this list and import only required elements
-import webnotes
-
-from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
-from webnotes.model import db_exists
-from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType
-from webnotes.model.doclist import getlist, copy_doclist
-from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
-from webnotes import session, form, is_testing, msgprint, errprint
-
-set = webnotes.conn.set
-sql = webnotes.conn.sql
-get_value = webnotes.conn.get_value
-in_transaction = webnotes.conn.in_transaction
-convert_to_lists = webnotes.conn.convert_to_lists
-	
-# -----------------------------------------------------------------------------------------
-
-
-class DocType:
-  #init function
-  def __init__(self,doc,doclist=[]):
-    self.doc = doc
-    self.doclist = doclist
-
-  def set_content(self):
-    ret_content = sql("select content from `tabBusiness Letter Template` where name ='%s'"%self.doc.template)
-    if ret_content: self.doc.content = ret_content[0][0]
-    return ''
\ No newline at end of file
diff --git a/tools/doctype/business_letter/business_letter.txt b/tools/doctype/business_letter/business_letter.txt
deleted file mode 100644
index 7be0abaf4a..0000000000
--- a/tools/doctype/business_letter/business_letter.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-20 11:10:52', 'search_fields': None, 'module': 'Tools', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'harshada@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 12, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'Letter/.####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': 'Master', 'name': 'Business Letter', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-10-22 10:37:10', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': 1, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00843', 'parent': 'Business Letter', 'read': 1, 'create': 1, 'creation': '2010-04-20 11:10:52', 'modified': '2010-10-22 10:37:10', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'All', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': 'owner', 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00844', 'parent': 'Business Letter', 'read': 1, 'create': 1, 'creation': '2010-04-20 11:10:52', 'modified': '2010-10-22 10:37:10', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'System Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-20 11:10:52', 'doctype': 'DocField', 'oldfieldname': 'letter_type', 'owner': 'harshada@webnotestech.com', 'reqd': 0, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Letter Type', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Business Letter', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04796', 'idx': 1, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-22 10:37:10', 'parenttype': 'DocType', 'fieldname': 'letter_type', 'fieldtype': 'Select', 'options': 'link:Business Letter Type', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-04-20 11:10:52', 'doctype': 'DocField', 'oldfieldname': 'template', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Template', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Business Letter', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04797', 'idx': 2, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-22 10:37:10', 'parenttype': 'DocType', 'fieldname': 'template', 'fieldtype': 'Link', 'options': 'Business Letter Template', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-04-20 11:10:52', 'doctype': 'DocField', 'oldfieldname': 'to_contact', 'owner': 'harshada@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'To Contact', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Business Letter', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04798', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-10-22 10:37:10', 'parenttype': 'DocType', 'fieldname': 'to_contact', 'fieldtype': 'Link', 'options': 'Contact', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-20 11:42:39', 'doctype': 'DocField', 'oldfieldname': 'title', 'owner': 'harshada@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': 1, 'modified_by': 'harshada@webnotestech.com', 'label': 'Title', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Business Letter', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04800', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-10-22 10:37:10', 'parenttype': 'DocType', 'fieldname': 'title', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text Editor', 'creation': '2010-04-20 11:10:52', 'doctype': 'DocField', 'oldfieldname': 'content', 'owner': 'harshada@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Content', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Business Letter', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04799', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-10-22 10:37:10', 'parenttype': 'DocType', 'fieldname': 'content', 'fieldtype': 'Text Editor', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/tools/doctype/business_letter_template/__init__.py b/tools/doctype/business_letter_template/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/business_letter_template/business_letter_template.js b/tools/doctype/business_letter_template/business_letter_template.js
deleted file mode 100644
index fe1457d4d3..0000000000
--- a/tools/doctype/business_letter_template/business_letter_template.js
+++ /dev/null
@@ -1,10 +0,0 @@
-$import(Tips Common)
-
-//--------- ONLOAD -------------
-cur_frm.cscript.onload = function(doc, cdt, cdn) {
-  cur_frm.cscript.get_tips(doc, cdt, cdn);
-}
-
-cur_frm.cscript.refresh = function(doc, cdt, cdn) {
-  cur_frm.cscript.get_tips(doc, cdt, cdn);
-}
\ No newline at end of file
diff --git a/tools/doctype/business_letter_template/business_letter_template.txt b/tools/doctype/business_letter_template/business_letter_template.txt
deleted file mode 100644
index 90af060c79..0000000000
--- a/tools/doctype/business_letter_template/business_letter_template.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-20 11:06:16', 'search_fields': None, 'module': 'Tools', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'harshada@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 3, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'field:title', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Business Letter Template', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00840', 'parent': 'Business Letter Template', 'read': 1, 'create': 1, 'creation': '2010-04-20 11:06:16', 'modified': '2010-09-20 09:03:29', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'System Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00841', 'parent': 'Business Letter Template', 'read': 1, 'create': None, 'creation': '2010-04-20 11:06:16', 'modified': '2010-09-20 09:03:29', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'All', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-20 11:06:16', 'doctype': 'DocField', 'oldfieldname': 'title', 'owner': 'harshada@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Title', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Business Letter Template', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04792', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 09:03:29', 'parenttype': 'DocType', 'fieldname': 'title', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-04-20 11:06:16', 'doctype': 'DocField', 'oldfieldname': 'letter_type', 'owner': 'harshada@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Letter Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Business Letter Template', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04794', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-09-20 09:03:29', 'parenttype': 'DocType', 'fieldname': 'letter_type', 'fieldtype': 'Link', 'options': 'Business Letter Type', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text Editor', 'creation': '2010-04-20 11:06:16', 'doctype': 'DocField', 'oldfieldname': 'content', 'owner': 'harshada@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Content', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Business Letter Template', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04793', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-09-20 09:03:29', 'parenttype': 'DocType', 'fieldname': 'content', 'fieldtype': 'Text Editor', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/tools/doctype/business_letter_type/__init__.py b/tools/doctype/business_letter_type/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/business_letter_type/business_letter_type.js b/tools/doctype/business_letter_type/business_letter_type.js
deleted file mode 100644
index fe1457d4d3..0000000000
--- a/tools/doctype/business_letter_type/business_letter_type.js
+++ /dev/null
@@ -1,10 +0,0 @@
-$import(Tips Common)
-
-//--------- ONLOAD -------------
-cur_frm.cscript.onload = function(doc, cdt, cdn) {
-  cur_frm.cscript.get_tips(doc, cdt, cdn);
-}
-
-cur_frm.cscript.refresh = function(doc, cdt, cdn) {
-  cur_frm.cscript.get_tips(doc, cdt, cdn);
-}
\ No newline at end of file
diff --git a/tools/doctype/business_letter_type/business_letter_type.txt b/tools/doctype/business_letter_type/business_letter_type.txt
deleted file mode 100644
index 38a11b8320..0000000000
--- a/tools/doctype/business_letter_type/business_letter_type.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-20 11:03:59', 'search_fields': None, 'module': 'Tools', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'harshada@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 3, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'field:letter_type', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': 'Master', 'name': 'Business Letter Type', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00839', 'parent': 'Business Letter Type', 'read': 1, 'create': 1, 'creation': '2010-04-20 11:03:59', 'modified': '2010-09-20 09:03:40', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'System Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'ashwini@webnotestech.com', 'name': 'PERM00842', 'parent': 'Business Letter Type', 'read': 1, 'create': None, 'creation': '2010-04-20 11:06:28', 'modified': '2010-09-20 09:03:40', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 2, 'parenttype': 'DocType', 'role': 'All', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-20 11:03:59', 'doctype': 'DocField', 'oldfieldname': 'letter_type', 'owner': 'harshada@webnotestech.com', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Letter Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Business Letter Type', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04791', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-09-20 09:03:40', 'parenttype': 'DocType', 'fieldname': 'letter_type', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/tools/doctype/contact/__init__.py b/tools/doctype/contact/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/contact/contact.txt b/tools/doctype/contact/contact.txt
deleted file mode 100644
index 81a97a30cb..0000000000
--- a/tools/doctype/contact/contact.txt
+++ /dev/null
@@ -1,786 +0,0 @@
-[
-	{
-		'_last_update': '1306748466',
-		'_user_tags': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': 1,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:55',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': 0,
-		'in_dialog': 1,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-05-30 16:34:29',
-		'modified_by': 'Administrator',
-		'module': 'Tools',
-		'name': 'Contact',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': '%(first_name)s %(last_name)s - Email: %(email_id)s | Contact: %(phone)s | Mobile: %(mobile_no)s',
-		'tag_fields': None,
-		'use_template': None,
-		'version': 245
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-10-27 14:40:07',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-05-30 16:34:29',
-		'modified_by': 'Administrator',
-		'name': 'PERM00721',
-		'owner': 'Administrator',
-		'parent': 'Contact',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-10-27 14:40:07',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-05-30 16:34:29',
-		'modified_by': 'Administrator',
-		'name': 'PERM00722',
-		'owner': 'Administrator',
-		'parent': 'Contact',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Purchase User',
-		'submit': None,
-		'write': None
-	},
-	{
-		'amend': 0,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:08:55',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-05-30 16:34:29',
-		'modified_by': 'Administrator',
-		'name': 'PERM00125',
-		'owner': 'Administrator',
-		'parent': 'Contact',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Sales Master Manager',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:08:55',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2011-05-30 16:34:29',
-		'modified_by': 'Administrator',
-		'name': 'PERM00128',
-		'owner': 'Administrator',
-		'parent': 'Contact',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Purchase Master Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2010-08-08 17:08:55',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2011-05-30 16:34:29',
-		'modified_by': 'Administrator',
-		'name': 'PERM00129',
-		'owner': 'Administrator',
-		'parent': 'Contact',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-27 18:28:50',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Contact Details',
-		'modified': '2011-05-30 16:34:29',
-		'modified_by': 'Administrator',
-		'name': 'FL04808',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Contact',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-27 18:28:50',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-30 16:34:29',
-		'modified_by': 'Administrator',
-		'name': 'FL04809',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Contact',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'first_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'First Name',
-		'modified': '2011-05-30 16:34:29',
-		'modified_by': 'Administrator',
-		'name': 'FL00758',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'first_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Contact',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'last_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Last Name',
-		'modified': '2011-05-30 16:34:29',
-		'modified_by': 'Administrator',
-		'name': 'FL00759',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'last_name',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Contact',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:47:57',
-		'default': None,
-		'depends_on': 'eval:!doc.supplier && !doc.sales_partner',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 5,
-		'in_filter': None,
-		'label': 'Customer',
-		'modified': '2011-05-30 16:34:29',
-		'modified_by': 'Administrator',
-		'name': 'FL03855',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'customer',
-		'oldfieldtype': 'Link',
-		'options': 'Customer',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Contact',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': 0,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-17 14:03:55',
-		'default': None,
-		'depends_on': 'eval:!doc.supplier && !doc.sales_partner',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'customer_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 6,
-		'in_filter': None,
-		'label': 'Customer Name',
-		'modified': '2011-05-30 16:34:29',
-		'modified_by': 'Administrator',
-		'name': '000001020',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Contact',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-04-25 18:42:39',
-		'default': None,
-		'depends_on': 'eval:!doc.customer && !doc.sales_partner',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 7,
-		'in_filter': None,
-		'label': 'Supplier',
-		'modified': '2011-05-30 16:34:29',
-		'modified_by': 'Administrator',
-		'name': '000000574',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Supplier',
-		'owner': 'Administrator',
-		'parent': 'Contact',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
-	},
-	{
-		'allow_on_submit': 0,
-		'colour': 'White:FFF',
-		'creation': '2011-05-17 14:03:55',
-		'default': None,
-		'depends_on': 'eval:!doc.customer && !doc.sales_partner',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'supplier_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 8,
-		'in_filter': None,
-		'label': 'Supplier Name',
-		'modified': '2011-05-30 16:34:29',
-		'modified_by': 'Administrator',
-		'name': '000001021',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Contact',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-05-17 14:43:27',
-		'default': None,
-		'depends_on': 'eval:!doc.customer && !doc.supplier',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'sales_partner',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 9,
-		'in_filter': None,
-		'label': 'Sales Partner',
-		'modified': '2011-05-30 16:34:29',
-		'modified_by': 'Administrator',
-		'name': '000001030',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Sales Partner',
-		'owner': 'Administrator',
-		'parent': 'Contact',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:56',
-		'default': '0',
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'is_primary_contact',
-		'fieldtype': 'Check',
-		'hidden': None,
-		'icon': None,
-		'idx': 10,
-		'in_filter': None,
-		'label': 'Is Primary Contact',
-		'modified': '2011-05-30 16:34:29',
-		'modified_by': 'Administrator',
-		'name': 'FL00776',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'is_primary_contact',
-		'oldfieldtype': 'Select',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Contact',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-05-27 18:28:50',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 11,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-05-30 16:34:29',
-		'modified_by': 'Administrator',
-		'name': 'FL04810',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Contact',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': '50%'
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'email_id',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 12,
-		'in_filter': None,
-		'label': 'Email Id',
-		'modified': '2011-05-30 16:34:29',
-		'modified_by': 'Administrator',
-		'name': 'FL00779',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'email_id',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Contact',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'phone',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 13,
-		'in_filter': None,
-		'label': 'Phone',
-		'modified': '2011-05-30 16:34:29',
-		'modified_by': 'Administrator',
-		'name': 'FL00778',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'contact_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Contact',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'mobile_no',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 14,
-		'in_filter': None,
-		'label': 'Mobile No',
-		'modified': '2011-05-30 16:34:30',
-		'modified_by': 'Administrator',
-		'name': 'FL00780',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'mobile_no',
-		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Contact',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-04-26 12:04:54',
-		'default': None,
-		'depends_on': None,
-		'description': 'Enter department to which this Contact belongs',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'department',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 15,
-		'in_filter': None,
-		'label': 'Department',
-		'modified': '2011-05-30 16:34:30',
-		'modified_by': 'Administrator',
-		'name': '000000575',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Suggest',
-		'owner': 'Administrator',
-		'parent': 'Contact',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': 'White:FFF',
-		'creation': '2011-04-26 12:04:54',
-		'default': None,
-		'depends_on': None,
-		'description': 'Enter designation of this Contact',
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'designation',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 16,
-		'in_filter': None,
-		'label': 'Designation',
-		'modified': '2011-05-30 16:34:30',
-		'modified_by': 'Administrator',
-		'name': '000000576',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'Suggest',
-		'owner': 'Administrator',
-		'parent': 'Contact',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'trash_reason',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 17,
-		'in_filter': None,
-		'label': 'Trash Reason',
-		'modified': '2011-05-30 16:34:30',
-		'modified_by': 'Administrator',
-		'name': 'FL00755',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': 'trash_reason',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Contact',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/tools/doctype/contact_detail/__init__.py b/tools/doctype/contact_detail/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/contact_detail/contact_detail.txt b/tools/doctype/contact_detail/contact_detail.txt
deleted file mode 100644
index 6f589681d8..0000000000
--- a/tools/doctype/contact_detail/contact_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-03-30 18:16:41', 'search_fields': None, 'module': 'Tools', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 5, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'CD/.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Contact Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-30 18:16:41', 'doctype': 'DocField', 'oldfieldname': 'contact_person', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Contact Person', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Contact Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01574', 'idx': 1, 'default': None, 'colour': None, 'modified': '2009-07-20 19:14:16', 'parenttype': 'DocType', 'fieldname': 'contact_person', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-30 18:16:41', 'doctype': 'DocField', 'oldfieldname': 'contact_no', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Contact No', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Contact Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01575', 'idx': 2, 'default': None, 'colour': None, 'modified': '2009-07-20 19:14:16', 'parenttype': 'DocType', 'fieldname': 'contact_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-30 18:16:41', 'doctype': 'DocField', 'oldfieldname': 'department', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Department', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Contact Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01576', 'idx': 3, 'default': None, 'colour': None, 'modified': '2009-07-20 19:14:16', 'parenttype': 'DocType', 'fieldname': 'department', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-05-06 17:14:06', 'doctype': 'DocField', 'oldfieldname': 'designation', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Designation', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Contact Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02006', 'idx': 4, 'default': None, 'colour': None, 'modified': '2009-07-20 19:14:16', 'parenttype': 'DocType', 'fieldname': 'designation', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2009-05-19 10:57:20', 'doctype': 'DocField', 'oldfieldname': 'email_id', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Email Id', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Contact Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02092', 'idx': 5, 'default': None, 'colour': None, 'modified': '2009-07-20 19:14:16', 'parenttype': 'DocType', 'fieldname': 'email_id', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/tools/doctype/file_browser_control/__init__.py b/tools/doctype/file_browser_control/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/file_browser_control/file_browser_control.txt b/tools/doctype/file_browser_control/file_browser_control.txt
deleted file mode 100644
index 08b7f599d9..0000000000
--- a/tools/doctype/file_browser_control/file_browser_control.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-	{
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2009-10-28 10:25:03',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': 1,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2010-09-20 14:06:57',
-		'modified_by': 'Administrator',
-		'module': 'Tools',
-		'name': 'File Browser Control',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': None,
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 81
-	}
-]
\ No newline at end of file
diff --git a/tools/doctype/rating_template/__init__.py b/tools/doctype/rating_template/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/rating_template/rating_template.txt b/tools/doctype/rating_template/rating_template.txt
deleted file mode 100644
index 870e125a87..0000000000
--- a/tools/doctype/rating_template/rating_template.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-11-12 18:12:18', 'search_fields': None, 'module': 'Tools', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 4, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'field:template_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Rating Template', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00516', 'parent': 'Rating Template', 'read': 1, 'create': 1, 'creation': '2009-11-12 18:12:18', 'modified': '2010-08-06 01:21:20', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-12 18:12:18', 'doctype': 'DocField', 'oldfieldname': 'template_name', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Template Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Rating Template', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03336', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-08-06 01:21:20', 'parenttype': 'DocType', 'fieldname': 'template_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Int', 'creation': '2009-11-12 18:12:18', 'doctype': 'DocField', 'oldfieldname': 'total_stars', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Total Stars', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Rating Template', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03337', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-08-06 01:21:20', 'parenttype': 'DocType', 'fieldname': 'total_stars', 'fieldtype': 'Int', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2009-11-12 18:12:18', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Rating Template Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Rating Template', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03338', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-08-06 01:21:20', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Table', 'creation': '2009-11-12 18:12:18', 'doctype': 'DocField', 'oldfieldname': 'rating_template_details', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Rating Template Details1', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Rating Template', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03339', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-08-06 01:21:20', 'parenttype': 'DocType', 'fieldname': 'rating_template_details', 'fieldtype': 'Table', 'options': 'Rating Template Detail', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/tools/doctype/rating_template_detail/__init__.py b/tools/doctype/rating_template_detail/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/rating_template_detail/rating_template_detail.txt b/tools/doctype/rating_template_detail/rating_template_detail.txt
deleted file mode 100644
index 31050a5eb5..0000000000
--- a/tools/doctype/rating_template_detail/rating_template_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-11-12 18:13:41', 'search_fields': None, 'module': 'Tools', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 3, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'RTD/.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Rating Template Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Int', 'creation': '2009-11-12 18:13:41', 'doctype': 'DocField', 'oldfieldname': 'rating', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Rating', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Rating Template Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03340', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-08-06 01:21:10', 'parenttype': 'DocType', 'fieldname': 'rating', 'fieldtype': 'Int', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-12 18:13:41', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Rating Template Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03341', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-08-06 01:21:10', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/tools/doctype/rating_widget_control/__init__.py b/tools/doctype/rating_widget_control/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/rating_widget_control/rating_widget_control.py b/tools/doctype/rating_widget_control/rating_widget_control.py
deleted file mode 100644
index d5c5bad45d..0000000000
--- a/tools/doctype/rating_widget_control/rating_widget_control.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# Please edit this list and import only required elements
-import webnotes
-
-from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
-from webnotes.model import db_exists
-from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType
-from webnotes.model.doclist import getlist, copy_doclist
-from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
-from webnotes import session, form, is_testing, msgprint, errprint
-
-set = webnotes.conn.set
-sql = webnotes.conn.sql
-get_value = webnotes.conn.get_value
-in_transaction = webnotes.conn.in_transaction
-convert_to_lists = webnotes.conn.convert_to_lists
-	
-# -----------------------------------------------------------------------------------------
-
-
-class DocType:
-    def __init__(self,d,dl):
-        self.doc, self.doclist = d, dl
-        
-    def show_my_rating(self,arg):
-        arg = eval(arg)
-        ret = {}
-        ret['total_stars'] = convert_to_lists(sql("select total_stars from `tabRating Template` where name = %s", arg['template']))
-        ret['avg_rating'] = convert_to_lists(sql("select count(name),round(sum(rating_stars)/count(name)) from `tabRating Widget Record` where rating_doctype = %s and rating_docname = %s and rating_template = %s",(arg['dt'], arg['dn'], arg['template'])))
-        rating_details = convert_to_lists(sql("select name, rating_stars, rating_description, rating_template, rating_by, rating_to, rating_date, rating_time, rating_doctype, rating_docname from `tabRating Widget Record` where rating_by = %s and rating_doctype = %s and rating_docname = %s and rating_template = %s",(arg['by'], arg['dt'], arg['dn'], arg['template'])))
-        if rating_details:
-            ret['rating_details'] = rating_details or ''
-            ret['flag'] = 1
-        else:
-            ret['rating_desc'] = convert_to_lists(sql("select rating, description from `tabRating Template Detail` where parent = %s", arg['template']))
-            ret['flag'] = 0
-        return ret
-        
-    def add_rating(self,arg):
-        import time
-        arg = eval(arg)
-        rw = Document('Rating Widget Record')
-        rw.rating_stars = arg['rating']
-        rw.rating_description = arg['desc']
-        rw.rating_template = arg['template']
-        rw.rating_by = arg['rating_by']
-        rw.rating_to = Document(arg['dt'],arg['dn']).owner
-        rw.rating_date = nowdate()
-        rw.rating_time = time.strftime('%H:%M')
-        rw.rating_doctype = arg['dt']
-        rw.rating_docname = arg['dn']
-        rw.save(1)
\ No newline at end of file
diff --git a/tools/doctype/rating_widget_control/rating_widget_control.txt b/tools/doctype/rating_widget_control/rating_widget_control.txt
deleted file mode 100644
index 34c6ccf337..0000000000
--- a/tools/doctype/rating_widget_control/rating_widget_control.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-11-12 18:26:54', 'search_fields': None, 'module': 'Tools', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 3, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Rating Widget Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/tools/doctype/rating_widget_record/__init__.py b/tools/doctype/rating_widget_record/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/rating_widget_record/rating_widget_record.txt b/tools/doctype/rating_widget_record/rating_widget_record.txt
deleted file mode 100644
index 6c6a0f3747..0000000000
--- a/tools/doctype/rating_widget_record/rating_widget_record.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-11-12 18:16:40', 'search_fields': None, 'module': 'Tools', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 3, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'RWR/.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Rating Widget Record', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00517', 'parent': 'Rating Widget Record', 'read': 1, 'create': 1, 'creation': '2009-11-12 18:16:40', 'modified': '2010-08-06 01:20:33', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Int', 'creation': '2009-11-12 18:16:40', 'doctype': 'DocField', 'oldfieldname': 'rating_stars', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Rating Stars', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Rating Widget Record', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03342', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-08-06 01:20:33', 'parenttype': 'DocType', 'fieldname': 'rating_stars', 'fieldtype': 'Int', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-12 18:16:40', 'doctype': 'DocField', 'oldfieldname': 'rating_description', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Rating Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Rating Widget Record', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03343', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-08-06 01:20:33', 'parenttype': 'DocType', 'fieldname': 'rating_description', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-12 18:16:40', 'doctype': 'DocField', 'oldfieldname': 'rating_template', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Rating Template', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Rating Widget Record', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03344', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-08-06 01:20:33', 'parenttype': 'DocType', 'fieldname': 'rating_template', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-12 18:16:40', 'doctype': 'DocField', 'oldfieldname': 'rating_by', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Rating By', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Rating Widget Record', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03345', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-08-06 01:20:33', 'parenttype': 'DocType', 'fieldname': 'rating_by', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-12 18:16:40', 'doctype': 'DocField', 'oldfieldname': 'rating_to', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Rating To', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Rating Widget Record', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03346', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-08-06 01:20:33', 'parenttype': 'DocType', 'fieldname': 'rating_to', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2009-11-12 18:16:40', 'doctype': 'DocField', 'oldfieldname': 'rating_date', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Rating Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Rating Widget Record', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03347', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-08-06 01:20:33', 'parenttype': 'DocType', 'fieldname': 'rating_date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-12 18:16:40', 'doctype': 'DocField', 'oldfieldname': 'rating_time', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Rating Time', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Rating Widget Record', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03348', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-08-06 01:20:33', 'parenttype': 'DocType', 'fieldname': 'rating_time', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-12 18:16:40', 'doctype': 'DocField', 'oldfieldname': 'rating_doctype', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Rating Doctype', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Rating Widget Record', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03349', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-08-06 01:20:33', 'parenttype': 'DocType', 'fieldname': 'rating_doctype', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-11-12 18:16:40', 'doctype': 'DocField', 'oldfieldname': 'rating_docname', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Rating Docname', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Rating Widget Record', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03350', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-08-06 01:20:33', 'parenttype': 'DocType', 'fieldname': 'rating_docname', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/tools/doctype/receiver_detail/__init__.py b/tools/doctype/receiver_detail/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/receiver_detail/receiver_detail.txt b/tools/doctype/receiver_detail/receiver_detail.txt
deleted file mode 100644
index 62d7ca2e12..0000000000
--- a/tools/doctype/receiver_detail/receiver_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-03-12 17:10:13', 'search_fields': None, 'module': 'Tools', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 2, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Receiver Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-07-05 13:29:27', 'doctype': 'DocField', 'oldfieldname': 'customer_name', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Customer Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Receiver Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05519', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-07-05 13:29:27', 'parenttype': 'DocType', 'fieldname': 'customer_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 17:10:13', 'doctype': 'DocField', 'oldfieldname': 'receiver_name', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Receiver Name', 'width': '350px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Receiver Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01344', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-07-05 13:29:27', 'parenttype': 'DocType', 'fieldname': 'receiver_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 17:10:13', 'doctype': 'DocField', 'oldfieldname': 'mobile_no', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Mobile No', 'width': '200px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Receiver Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01345', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-07-05 13:29:27', 'parenttype': 'DocType', 'fieldname': 'mobile_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/tools/doctype/rename_tool/__init__.py b/tools/doctype/rename_tool/__init__.py
deleted file mode 100755
index e69de29bb2..0000000000
diff --git a/tools/doctype/rename_tool/rename_tool.txt b/tools/doctype/rename_tool/rename_tool.txt
deleted file mode 100755
index 5947e67f42..0000000000
--- a/tools/doctype/rename_tool/rename_tool.txt
+++ /dev/null
@@ -1,225 +0,0 @@
-[
-	{
-		'_last_update': '1308739509',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': 1,
-		'allow_print': 1,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2011-06-23 11:03:25',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': 0,
-		'hide_toolbar': 0,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': 1,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-06-23 11:03:25',
-		'modified_by': 'Administrator',
-		'module': 'Tools',
-		'name': 'Rename Tool',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': None,
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
-		'version': 6
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2011-06-23 11:03:25',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-06-23 11:03:25',
-		'modified_by': 'Administrator',
-		'name': 'PERM00859',
-		'owner': 'Administrator',
-		'parent': 'Rename Tool',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-23 11:03:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'select_doctype',
-		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Select DocType',
-		'modified': '2011-06-23 11:03:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05599',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'link:DocType',
-		'owner': 'Administrator',
-		'parent': 'Rename Tool',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-23 11:03:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'document_to_rename',
-		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
-		'idx': 2,
-		'in_filter': None,
-		'label': 'Document to rename',
-		'modified': '2011-06-23 11:03:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05600',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Rename Tool',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-23 11:03:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'new_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
-		'idx': 3,
-		'in_filter': None,
-		'label': 'New Name',
-		'modified': '2011-06-23 11:03:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05601',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Rename Tool',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-06-23 11:03:25',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Button',
-		'hidden': None,
-		'icon': None,
-		'idx': 4,
-		'in_filter': None,
-		'label': 'Rename',
-		'modified': '2011-06-23 11:03:25',
-		'modified_by': 'Administrator',
-		'name': 'FL05602',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': 'rename',
-		'owner': 'Administrator',
-		'parent': 'Rename Tool',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	}
-]
\ No newline at end of file
diff --git a/tools/doctype/reposting_tool/__init__.py b/tools/doctype/reposting_tool/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/reposting_tool/reposting_tool.txt b/tools/doctype/reposting_tool/reposting_tool.txt
deleted file mode 100644
index 9673e3ad77..0000000000
--- a/tools/doctype/reposting_tool/reposting_tool.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-13 09:24:32', 'search_fields': None, 'module': 'Tools', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 0, 'read_only': 1, 'allow_email': 1, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 173, 'menu_index': None, 'docstatus': 0, 'allow_copy': 1, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': 1, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': '', 'name': 'Reposting Tool', 'idx': None, 'hide_toolbar': 1, 'colour': 'Light Blue:DEF', 'client_script': None, 'modified': '2010-10-14 12:15:59', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00769', 'parent': 'Reposting Tool', 'read': 1, 'create': 1, 'creation': '2010-04-13 09:24:32', 'modified': '2010-10-14 12:15:59', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-04-13 09:24:32', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Recalculate MAR & Actual Qty', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Reposting Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04638', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-10-14 12:15:59', 'parenttype': 'DocType', 'fieldname': 'recalculate_mar_&_actual_qty', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-07-28 13:34:48', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Repost Bin', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Reposting Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05722', 'idx': 2, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-14 12:15:59', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2010-07-30 09:22:26', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'jai@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Repost Account Balances', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Reposting Tool', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL05758', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-10-14 12:15:59', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/tools/doctype/sms_control/__init__.py b/tools/doctype/sms_control/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/sms_control/sms_control.txt b/tools/doctype/sms_control/sms_control.txt
deleted file mode 100644
index 727d41bda0..0000000000
--- a/tools/doctype/sms_control/sms_control.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-[
-	{
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:24',
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': 0,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': 1,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-04-08 16:53:02',
-		'modified_by': 'Administrator',
-		'module': 'Tools',
-		'name': 'SMS Control',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': '',
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'smallicon': None,
-		'use_template': None,
-		'version': 4
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': 1,
-		'creation': '2010-08-08 17:09:24',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-04-08 16:53:02',
-		'modified_by': 'Administrator',
-		'name': 'PERM00534',
-		'owner': 'Administrator',
-		'parent': 'SMS Control',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': None,
-		'create': None,
-		'creation': '2010-08-08 17:09:24',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-04-08 16:53:02',
-		'modified_by': 'Administrator',
-		'name': 'PERM00535',
-		'owner': 'Administrator',
-		'parent': 'SMS Control',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'Administrator',
-		'submit': None,
-		'write': None
-	}
-]
\ No newline at end of file
diff --git a/tools/doctype/sms_log/__init__.py b/tools/doctype/sms_log/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/sms_log/sms_log.txt b/tools/doctype/sms_log/sms_log.txt
deleted file mode 100644
index d53835b146..0000000000
--- a/tools/doctype/sms_log/sms_log.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2011-01-11 12:28:39', 'search_fields': None, 'module': 'Tools', 'doctype': 'DocType', 'change_log': None, 'print_outline': None, 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 4, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'SMSLOG/.########', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'SMS Log', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2011-01-11 12:51:46', 'server_code_error': None, 'name_case': None, 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00792', 'parent': 'SMS Log', 'read': 1, 'create': 0, 'creation': '2011-01-11 12:28:58', 'modified': '2011-01-11 12:51:46', 'submit': None, 'doctype': 'DocPerm', 'write': 0, 'idx': 1, 'parenttype': 'DocType', 'role': 'System Manager', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2011-01-11 12:28:40', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': None, 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'SMS Log', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04405', 'idx': 1, 'default': None, 'colour': None, 'modified': '2011-01-11 12:51:46', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2011-01-11 12:28:40', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Sender Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'SMS Log', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04399', 'idx': 2, 'default': None, 'colour': None, 'modified': '2011-01-11 12:51:46', 'parenttype': 'DocType', 'fieldname': 'sender_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2011-01-11 12:28:40', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Sent On', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'SMS Log', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04400', 'idx': 3, 'default': None, 'colour': None, 'modified': '2011-01-11 12:51:46', 'parenttype': 'DocType', 'fieldname': 'sent_on', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2011-01-11 12:28:40', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Receiver List', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'SMS Log', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04401', 'idx': 4, 'default': None, 'colour': None, 'modified': '2011-01-11 12:51:46', 'parenttype': 'DocType', 'fieldname': 'receiver_list', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2011-01-11 12:28:40', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': None, 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'SMS Log', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04406', 'idx': 5, 'default': None, 'colour': None, 'modified': '2011-01-11 12:51:46', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2011-01-11 12:28:40', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'No of Requested SMS', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'SMS Log', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04403', 'idx': 6, 'default': None, 'colour': None, 'modified': '2011-01-11 12:51:46', 'parenttype': 'DocType', 'fieldname': 'no_of_requested_sms', 'fieldtype': 'Int', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2011-01-11 12:28:40', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'No of Sent SMS', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'SMS Log', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04404', 'idx': 7, 'default': None, 'colour': None, 'modified': '2011-01-11 12:51:46', 'parenttype': 'DocType', 'fieldname': 'no_of_sent_sms', 'fieldtype': 'Int', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2011-01-11 12:28:40', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Message', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'SMS Log', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04402', 'idx': 8, 'default': None, 'colour': None, 'modified': '2011-01-11 12:51:46', 'parenttype': 'DocType', 'fieldname': 'message', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/tools/doctype/todo_item/__init__.py b/tools/doctype/todo_item/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/todo_item/todo_item.txt b/tools/doctype/todo_item/todo_item.txt
deleted file mode 100644
index d3d014cd85..0000000000
--- a/tools/doctype/todo_item/todo_item.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-12 12:01:55', 'search_fields': None, 'module': 'Tools', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 1, 'read_only': 1, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 9, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': 'TDI.########', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'ToDo Item', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': '', 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00019', 'parent': 'ToDo Item', 'read': 1, 'create': 1, 'creation': '2009-03-12 12:01:57', 'modified': '2010-05-06 18:12:29', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'All', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': None, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-03-12 12:01:57', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Description', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ToDo Item', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00227', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-05-06 18:12:29', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Date', 'creation': '2009-03-12 12:01:57', 'doctype': 'DocField', 'oldfieldname': 'date', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Date', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ToDo Item', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00228', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-05-06 18:12:29', 'parenttype': 'DocType', 'fieldname': 'date', 'fieldtype': 'Date', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:01:57', 'doctype': 'DocField', 'oldfieldname': 'priority', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Priority', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ToDo Item', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00229', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-05-06 18:12:29', 'parenttype': 'DocType', 'fieldname': 'priority', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:01:57', 'doctype': 'DocField', 'oldfieldname': 'reference_type', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Reference Type', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ToDo Item', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00230', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-05-06 18:12:29', 'parenttype': 'DocType', 'fieldname': 'reference_type', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-12 12:01:57', 'doctype': 'DocField', 'oldfieldname': 'reference_name', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Reference Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ToDo Item', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00231', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-05-06 18:12:29', 'parenttype': 'DocType', 'fieldname': 'reference_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Check', 'creation': '2009-03-12 12:01:57', 'doctype': 'DocField', 'oldfieldname': 'checked', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Checked', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ToDo Item', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00232', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-05-06 18:12:29', 'parenttype': 'DocType', 'fieldname': 'checked', 'fieldtype': 'Check', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-12 12:01:57', 'doctype': 'DocField', 'oldfieldname': 'role', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Role', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'ToDo Item', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL00233', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-05-06 18:12:29', 'parenttype': 'DocType', 'fieldname': 'role', 'fieldtype': 'Link', 'options': 'Role', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/tools/doctype/trash_control/__init__.py b/tools/doctype/trash_control/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/trash_control/trash_control.txt b/tools/doctype/trash_control/trash_control.txt
deleted file mode 100644
index b38d5a233a..0000000000
--- a/tools/doctype/trash_control/trash_control.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-04-19 09:59:18', 'search_fields': None, 'module': 'Tools', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 1, 'read_only': 1, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': None, 'max_attachments': None, 'version': 37, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': '', 'name': 'Trash Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-10-13 16:35:49', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/tools/doctype/tweet/__init__.py b/tools/doctype/tweet/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/tweet/tweet.txt b/tools/doctype/tweet/tweet.txt
deleted file mode 100644
index 5478912eb6..0000000000
--- a/tools/doctype/tweet/tweet.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-05-13 12:23:54', 'search_fields': None, 'module': 'Tools', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 6, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'TW.######', 'client_script_core': '', 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Tweet', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-17 12:48:20', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': '', 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00289', 'parent': 'Tweet', 'read': 1, 'create': None, 'creation': '2009-05-13 12:23:54', 'modified': '2010-03-31 10:23:27', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-05-13 12:23:54', 'doctype': 'DocField', 'oldfieldname': 'by', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'By', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Tweet', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02041', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-03-31 10:23:27', 'parenttype': 'DocType', 'fieldname': 'by', 'fieldtype': 'Link', 'options': 'Profile', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-05-13 12:23:54', 'doctype': 'DocField', 'oldfieldname': 'comment', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Comment', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Tweet', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02042', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-03-31 10:23:27', 'parenttype': 'DocType', 'fieldname': 'comment', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-08-26 01:31:48', 'doctype': 'DocField', 'oldfieldname': 'tag', 'owner': 'Administrator', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Tag', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Tweet', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL02712', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-03-31 10:23:27', 'parenttype': 'DocType', 'fieldname': 'tag', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/tools/doctype/while_you_were_out/__init__.py b/tools/doctype/while_you_were_out/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/while_you_were_out/while_you_were_out.txt b/tools/doctype/while_you_were_out/while_you_were_out.txt
deleted file mode 100644
index 7dc7ccb2b7..0000000000
--- a/tools/doctype/while_you_were_out/while_you_were_out.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2010-01-08 17:28:22', 'search_fields': None, 'module': 'Tools', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'dhanalekshmi@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 12, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'WYWR/.####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'While You Were Out', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00569', 'parent': 'While You Were Out', 'read': 1, 'create': 1, 'creation': '2010-01-08 17:28:22', 'modified': '2010-03-31 09:47:12', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'dhanalekshmi@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-01-08 17:28:22', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'dhanalekshmi@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'While You Were Out', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'While You Were Out', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03551', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-03-31 09:47:12', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-01-08 17:28:22', 'doctype': 'DocField', 'oldfieldname': 'from_user', 'owner': 'dhanalekshmi@webnotestech.com', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'From', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'While You Were Out', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03552', 'idx': 2, 'default': '__user', 'colour': None, 'modified': '2010-03-31 09:47:12', 'parenttype': 'DocType', 'fieldname': 'from_user', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2010-01-08 17:28:22', 'doctype': 'DocField', 'oldfieldname': 'to_user', 'owner': 'dhanalekshmi@webnotestech.com', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'To', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'While You Were Out', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03553', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-03-31 09:47:12', 'parenttype': 'DocType', 'fieldname': 'to_user', 'fieldtype': 'Link', 'options': 'Profile', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2010-01-08 17:28:22', 'doctype': 'DocField', 'oldfieldname': 'message', 'owner': 'dhanalekshmi@webnotestech.com', 'reqd': None, 'in_filter': 1, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Message', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'While You Were Out', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03554', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-03-31 09:47:12', 'parenttype': 'DocType', 'fieldname': 'message', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/tools/doctype/wiki_control/__init__.py b/tools/doctype/wiki_control/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/wiki_control/wiki_control.py b/tools/doctype/wiki_control/wiki_control.py
deleted file mode 100644
index 254ca9870d..0000000000
--- a/tools/doctype/wiki_control/wiki_control.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Please edit this list and import only required elements
-import webnotes
-
-from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
-from webnotes.model import db_exists
-from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType
-from webnotes.model.doclist import getlist, copy_doclist
-from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
-from webnotes import session, form, is_testing, msgprint, errprint
-
-set = webnotes.conn.set
-sql = webnotes.conn.sql
-get_value = webnotes.conn.get_value
-in_transaction = webnotes.conn.in_transaction
-convert_to_lists = webnotes.conn.convert_to_lists
-	
-# -----------------------------------------------------------------------------------------
-
-
-class DocType:
-  def __init__(self,d,dl):
-    self.doc = d
-    self.doclist = dl
-  
-  def get_wiki_detail(self,arg):
-    arg = eval(arg)
-    ret = {}
-    latest_revision = sql("select max(revision) from `tabWiki History` where reference=%s", arg['dn'])[0][0]
-    
-    ret['detail'] = convert_to_lists(sql("select revision, modified_by,creation from `tabWiki History` where reference=%s and revision=%s", (arg['dn'],latest_revision)))
-    ret['contributors'] = convert_to_lists(sql("select distinct modified_by from `tabWiki History` where reference=%s", arg['dn']))
-    return ret
\ No newline at end of file
diff --git a/tools/doctype/wiki_control/wiki_control.txt b/tools/doctype/wiki_control/wiki_control.txt
deleted file mode 100644
index 70f6474ddc..0000000000
--- a/tools/doctype/wiki_control/wiki_control.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-12-08 18:08:48', 'search_fields': None, 'module': 'Tools', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': 1, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 2, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Wiki Control', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00528', 'parent': 'Wiki Control', 'read': None, 'create': None, 'creation': '2009-12-08 18:08:48', 'modified': '2009-12-09 16:57:54', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}]
\ No newline at end of file
diff --git a/tools/doctype/wiki_history/__init__.py b/tools/doctype/wiki_history/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/wiki_history/wiki_history.txt b/tools/doctype/wiki_history/wiki_history.txt
deleted file mode 100644
index 3bb1fabc65..0000000000
--- a/tools/doctype/wiki_history/wiki_history.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-12-08 11:22:40', 'search_fields': None, 'module': 'Tools', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 5, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': 'WH/.#####', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Wiki History', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00527', 'parent': 'Wiki History', 'read': 1, 'create': 1, 'creation': '2009-12-08 11:22:40', 'modified': '2009-12-09 16:57:44', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-12-08 11:22:40', 'doctype': 'DocField', 'oldfieldname': 'reference', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Reference', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Wiki History', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03483', 'idx': 1, 'default': None, 'colour': None, 'modified': '2009-12-09 16:57:44', 'parenttype': 'DocType', 'fieldname': 'reference', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-12-08 11:22:40', 'doctype': 'DocField', 'oldfieldname': 'version_no', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': 1, 'modified_by': 'Administrator', 'label': 'Version No', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Wiki History', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03484', 'idx': 2, 'default': None, 'colour': None, 'modified': '2009-12-09 16:57:44', 'parenttype': 'DocType', 'fieldname': 'version_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Int', 'creation': '2009-12-08 17:57:57', 'doctype': 'DocField', 'oldfieldname': 'revision', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Revision', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Wiki History', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03487', 'idx': 3, 'default': None, 'colour': None, 'modified': '2009-12-09 16:57:44', 'parenttype': 'DocType', 'fieldname': 'revision', 'fieldtype': 'Int', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text Editor', 'creation': '2009-12-08 11:22:40', 'doctype': 'DocField', 'oldfieldname': 'editor', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Editor', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Wiki History', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03485', 'idx': 4, 'default': None, 'colour': None, 'modified': '2009-12-09 16:57:44', 'parenttype': 'DocType', 'fieldname': 'editor', 'fieldtype': 'Text Editor', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/tools/doctype/wiki_page/__init__.py b/tools/doctype/wiki_page/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/doctype/wiki_page/wiki_page.txt b/tools/doctype/wiki_page/wiki_page.txt
deleted file mode 100644
index 1a6bb4d0e6..0000000000
--- a/tools/doctype/wiki_page/wiki_page.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-12-04 10:56:29', 'search_fields': None, 'module': 'Tools', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': 1, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 43, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': 'class DocType:\n  def __init__(self, d, dl):\n    self.doc, self.doclist = d,dl\n\n  # replace $image\n  # ------------------\n  def validate(self):\n    import re\n    p = re.compile(\'\\$page\\( (?P [^)]*) \\)\', re.VERBOSE)\n    i = re.compile(\'\\$image\\( (?P [^)]*) \\)\', re.VERBOSE)\n    if self.doc.editor:\n      self.doc.editor = p.sub(self.replace_by_link, self.doc.editor)\n      self.doc.editor = i.sub(self.replace_by_img, self.doc.editor)\n  \n  def replace_by_link(self, match):\n    name = match.group(\'name\')\n    \n    # create wiki page if not created\n    if not db_exists(\'Wiki Page\', name):\n      w = Document(\'Wiki Page\')\n      w.page_name = name\n      w.save(1)\n    \n    return \'\'\'%s\'\'\' % (name, name)\n    \n  def replace_by_img(self, match):\n    name = match.group(\'name\')\n    return \'\' % (session[\'data\'][\'control_panel\'][\'account_id\'], name)    \n    \n  def on_update(self):\n    if not sql("select name from `tabWiki History` where reference=%s", self.doc.name):\n      latest_revision = 0\n      self.make_history(latest_revision)\n    else:\n      latest_revision = sql("select max(revision) from `tabWiki History` where reference=%s", self.doc.name)[0][0]\n      if latest_revision:\n        content = sql("select editor from `tabWiki History` where revision = %s and reference = %s", (latest_revision, self.doc.name))[0][0]\n        \n        if content == self.doc.editor:\n          pass\n        else:\n          self.make_history(latest_revision)\n\n  def make_history(self,revision):\n    wh = Document(\'Wiki History\')\n    wh.reference = self.doc.name\n    wh.editor = self.doc.editor\n    wh.revision = cint(revision) + 1\n    wh.save(1)', 'allow_trash': None, 'allow_print': None, 'autoname': 'field:page_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Wiki Page', 'idx': None, 'hide_toolbar': 1, 'colour': 'White:FFF', 'client_script': 'cur_frm.cscript.onload = function(doc,dt,dn) {\n  pscript.cur_doc = doc; pscript.cur_dt = dt; pscript.cur_dn = dn;\n  \n  set_field_options(\'Page HTML\', doc.editor);\n  set_field_options(\'Heading\', \'
\'+doc.name+\'
\');\n  \n\n  unhide_field(\'Page HTML\');\n  unhide_field(\'Edit\');\n\n  hide_field(\'editor\');\n  hide_field(\'Done\');\n  \n  pscript.show_wiki_history(doc,dt,dn);\n}\n\ncur_frm.cscript.refresh = function() {\n  \n}\n\ncur_frm.cscript.Edit = function(doc,dt,dn) {\n  hide_field(\'Page HTML\');\n  hide_field(\'Edit\');\n\n  unhide_field(\'editor\');\n  unhide_field(\'Done\');\n}\n\ncur_frm.cscript.Done = function(doc,dt,dn) {\n\n  unhide_field(\'Page HTML\');\n  unhide_field(\'Edit\');\n\n  hide_field(\'editor\');\n  hide_field(\'Done\');\n\n  cur_frm.save(\'Save\', function() {\n    set_field_options(\'Page HTML\', locals[\'Wiki Page\'][doc.name].editor);\n    pscript.show_wiki_history(doc,dt,dn);\n  });\n  //\n}\n\n// Showing wiki detail\npscript.show_wiki_history = function(doc,dt,dn){\n /* $c(\'runserverobj\',args={\'method\':\'get_wiki_detail\',\'docs\':compress_doclist([doc])},\n  function(r,rt){\n    alert(\'in callback\');\n    alert(r.message);\n    detail = r.message.detail;\n    contributors = r.message.contributors;\n    \n    var txt = \'
This is Revision - \' + detail[0][0] + \' of \' + dn +\'.\' + \'
Last modified by \' + detail[0][1] + \' on \' + dateutil.str_to_user(detail[0][2])\n                  + \'

Contributors : \' + contributors.join(\', \');\n    set_field_options(\'History HTML\', txt);\n  })*/\n  \n  var callback = function(r,rt){\n    detail = r.message.detail;\n    contributors = r.message.contributors;\n    \n    var txt = \'
This is Revision - \' + detail[0][0] + \' of \' + dn +\'.\' + \'
Last modified by \' + detail[0][1] + \' on \' + dateutil.str_to_user(detail[0][2])\n                  + \'

Contributors : \' + contributors.join(\', \');\n    set_field_options(\'History HTML\', txt);\n  }\n  \n  args = {};\n  args.doc = doc; args.dt = dt; args.dn = dn;\n  $c_obj(\'Wiki Control\',\'get_wiki_detail\', docstring(args),callback);\n}\n\n// showing page history (keep this we will use this later)\n/*\npscript.show_page_history = function(){\n  if(!pscript.history_list){\n    history_list = new Listing(\'\',1);\n    history_list.colwidths = [\'30%\',\'30%\',\'40%\'];\n    history_list.colnames = [\'Revision\', \'Date\', \'Modified By\'];\n    pscript.history_list = history_list;\n  }\n  \n  if(!pscript.history_div){ pscript.history_div = document.createElement(\'div\'); }\n  pscript.history_div.innerHTML = \'\';\n\n  pscript.history_list.get_query = function(){\n    this.query = repl("select version_no, creation, modified_by, name from `tabWiki History` where reference=\'%(ref)s\' order by version_no desc", {\'ref\':pscript.cur_dn});\n    this.query_max = repl("select count(name) from `tabWiki History` where reference=\'%(ref)s\'", {\'ref\':pscript.cur_dn});\n  }\n  \n  pscript.history_list.show_cell = function(cell,ri,ci,d){\n    if(ci==0){\n      alert(d[ri][3]);\n      \n      var revision = $a(cell,\'span\',\'link_type\');\n      revision.innerHTML = \'Revision - \' + d[ri][0];\n      revision.name = d[ri][3];\n      \n      revision.onclick = function(){ alert(1); alert(this.name); }\n    }\n    \n    if(ci==1){ cell.innerHTML = dateutil.str_to_user(d[ri][1]); }\n    \n    if(ci==2){ cell.innerHTML = d[ri][2]; }\n  }\n  \n  pscript.history_list.make(pscript.history_div);\n  \n  pscript.history_list.run();\n  \n  pscript.history_list.onrun = function(){\n    //set_field_options\n    var df = get_field(pscript.cur_dt, \'History HTML\', pscript.cur_dn);\n    if(df)df.options = pscript.history_div;\n    alert(df.options);\n    msgprint(df.options);\n    refresh_field(\'History HTML\');\n  }\n}\n\npscript.show_history_content = function(wh){\n  alert(wh);\n}\n*/', 'modified': '2010-09-20 14:06:57', 'server_code_error': '
', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'Administrator', 'name': 'PERM00526', 'parent': 'Wiki Page', 'read': 1, 'create': 1, 'creation': '2009-12-04 10:56:29', 'modified': '2009-12-09 18:18:55', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'All', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-12-04 10:56:29', 'doctype': 'DocField', 'oldfieldname': 'page_name', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Page Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Wiki Page', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03472', 'idx': 1, 'default': None, 'colour': None, 'modified': '2009-12-09 18:18:55', 'parenttype': 'DocType', 'fieldname': 'page_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'HTML', 'creation': '2009-12-04 10:56:29', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Heading', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Wiki Page', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03473', 'idx': 2, 'default': None, 'colour': None, 'modified': '2009-12-09 18:18:55', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2009-12-04 10:56:29', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Done', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Wiki Page', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03474', 'idx': 3, 'default': None, 'colour': None, 'modified': '2009-12-09 18:18:55', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'HTML', 'creation': '2009-12-04 10:56:29', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Page HTML', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Wiki Page', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03475', 'idx': 4, 'default': None, 'colour': None, 'modified': '2009-12-09 18:18:55', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text Editor', 'creation': '2009-12-04 10:56:29', 'doctype': 'DocField', 'oldfieldname': 'editor', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Editor', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Wiki Page', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03476', 'idx': 5, 'default': None, 'colour': 'White:FFF', 'modified': '2009-12-09 18:18:55', 'parenttype': 'DocType', 'fieldname': 'editor', 'fieldtype': 'Text Editor', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2009-12-04 10:56:29', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Edit', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Wiki Page', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03477', 'idx': 6, 'default': None, 'colour': 'White:FFF', 'modified': '2009-12-09 18:18:55', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'HTML', 'creation': '2009-12-04 10:56:29', 'doctype': 'DocField', 'oldfieldname': '', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Footer HTML', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Wiki Page', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03478', 'idx': 7, 'default': None, 'colour': None, 'modified': '2009-12-09 18:18:55', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'HTML', 'options': '
To create / link another WIki Page, use $page(New Page Name)
\n\n
To add image, use $image(filename)
\n', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'HTML', 'creation': '2009-12-07 16:49:50', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'History HTML', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Wiki Page', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03482', 'idx': 8, 'default': None, 'colour': None, 'modified': '2009-12-09 18:18:55', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': '', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/tools/page/__init__.py b/tools/page/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/page/file_browser/__init__.py b/tools/page/file_browser/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/page/file_browser/file_browser.txt b/tools/page/file_browser/file_browser.txt
deleted file mode 100644
index fa4f4a19e9..0000000000
--- a/tools/page/file_browser/file_browser.txt
+++ /dev/null
@@ -1,194 +0,0 @@
-[
-	{
-		'content': None,
-		'creation': '2010-11-30 17:25:41',
-		'docstatus': 0,
-		'doctype': 'Page',
-		'icon': '',
-		'idx': None,
-		'menu_index': None,
-		'modified': '2010-09-25 00:00:00',
-		'modified_by': 'Administrator',
-		'module': 'Tools',
-		'name': 'File Browser',
-		'owner': 'Administrator',
-		'page_name': 'File Browser',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'script': None,
-		'show_in_menu': 1,
-		'standard': 'Yes',
-		'static_content': '',
-		'style': ''
-	},
-	{
-		'creation': '2010-11-30 17:25:41',
-		'docstatus': 0,
-		'doctype': 'Page Role',
-		'idx': 1,
-		'modified': '2010-11-30 17:25:41',
-		'modified_by': 'Administrator',
-		'name': 'PR000031',
-		'owner': 'Administrator',
-		'parent': 'File Browser',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
-		'role': 'Administrator'
-	},
-	{
-		'creation': '2010-11-30 17:25:41',
-		'docstatus': 0,
-		'doctype': 'Page Role',
-		'idx': 2,
-		'modified': '2010-11-30 17:25:41',
-		'modified_by': 'Administrator',
-		'name': 'PR000032',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'File Browser',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
-		'role': 'Sales User'
-	},
-	{
-		'creation': '2010-11-30 17:25:41',
-		'docstatus': 0,
-		'doctype': 'Page Role',
-		'idx': 3,
-		'modified': '2010-11-30 17:25:41',
-		'modified_by': 'Administrator',
-		'name': 'PR000033',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'File Browser',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
-		'role': 'Sales Manager'
-	},
-	{
-		'creation': '2010-11-30 17:25:41',
-		'docstatus': 0,
-		'doctype': 'Page Role',
-		'idx': 4,
-		'modified': '2010-11-30 17:25:41',
-		'modified_by': 'Administrator',
-		'name': 'PR000034',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'File Browser',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
-		'role': 'System Manager'
-	},
-	{
-		'creation': '2010-11-30 17:25:41',
-		'docstatus': 0,
-		'doctype': 'Page Role',
-		'idx': 5,
-		'modified': '2010-11-30 17:25:41',
-		'modified_by': 'Administrator',
-		'name': 'PR000035',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'File Browser',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
-		'role': 'Purchase User'
-	},
-	{
-		'creation': '2010-11-30 17:25:41',
-		'docstatus': 0,
-		'doctype': 'Page Role',
-		'idx': 6,
-		'modified': '2010-11-30 17:25:41',
-		'modified_by': 'Administrator',
-		'name': 'PR000036',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'File Browser',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
-		'role': 'Purchase Manager'
-	},
-	{
-		'creation': '2010-11-30 17:25:41',
-		'docstatus': 0,
-		'doctype': 'Page Role',
-		'idx': 7,
-		'modified': '2010-11-30 17:25:41',
-		'modified_by': 'Administrator',
-		'name': 'PR000037',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'File Browser',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
-		'role': 'Accounts User'
-	},
-	{
-		'creation': '2010-11-30 17:25:41',
-		'docstatus': 0,
-		'doctype': 'Page Role',
-		'idx': 8,
-		'modified': '2010-11-30 17:25:41',
-		'modified_by': 'Administrator',
-		'name': 'PR000038',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'File Browser',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
-		'role': 'Accounts Manager'
-	},
-	{
-		'creation': '2010-11-30 17:25:41',
-		'docstatus': 0,
-		'doctype': 'Page Role',
-		'idx': 9,
-		'modified': '2010-11-30 17:25:41',
-		'modified_by': 'Administrator',
-		'name': 'PR000039',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'File Browser',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
-		'role': 'Production User'
-	},
-	{
-		'creation': '2010-11-30 17:25:41',
-		'docstatus': 0,
-		'doctype': 'Page Role',
-		'idx': 10,
-		'modified': '2010-11-30 17:25:41',
-		'modified_by': 'Administrator',
-		'name': 'PR000040',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'File Browser',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
-		'role': 'Production Manager'
-	},
-	{
-		'creation': '2010-11-30 17:25:41',
-		'docstatus': 0,
-		'doctype': 'Page Role',
-		'idx': 11,
-		'modified': '2010-11-30 17:25:41',
-		'modified_by': 'Administrator',
-		'name': 'PR000041',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'File Browser',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
-		'role': 'Material User'
-	},
-	{
-		'creation': '2010-11-30 17:25:41',
-		'docstatus': 0,
-		'doctype': 'Page Role',
-		'idx': 12,
-		'modified': '2010-11-30 17:25:41',
-		'modified_by': 'Administrator',
-		'name': 'PR000042',
-		'owner': 'Administrator',
-		'parent': 'File Browser',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
-		'role': 'Customer'
-	}
-]
\ No newline at end of file
diff --git a/tools/page/messages/__init__.py b/tools/page/messages/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/page/trash/__init__.py b/tools/page/trash/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/page/trash/trash.txt b/tools/page/trash/trash.txt
deleted file mode 100644
index 9be29a9e87..0000000000
--- a/tools/page/trash/trash.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'creation': '2010-04-17 14:36:24', 'module': 'Tools', 'doctype': 'Page', 'owner': 'Administrator', 'style': None, 'modified_by': 'saumil@webnotestech.com', 'script': None, 'show_in_menu': 0, 'content': None, 'page_name': 'Trash', 'menu_index': None, 'docstatus': 0, 'parent': None, 'standard': 'Yes', 'icon': None, 'name': 'Trash', 'idx': None, 'static_content': None, 'modified': '2010-09-25 00:00:00', 'parenttype': None, 'parent_node': None, 'parentfield': None}, {'modified_by': 'saumil@webnotestech.com', 'name': 'PR000122', 'parent': 'Trash', 'creation': '2010-04-19 10:03:20', 'modified': '2010-09-16 16:50:16', 'doctype': 'Page Role', 'idx': 1, 'parenttype': 'Page', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': 'roles'}, {'modified_by': 'saumil@webnotestech.com', 'name': 'PR000123', 'parent': 'Trash', 'creation': '2010-04-21 10:33:38', 'modified': '2010-09-16 16:50:16', 'doctype': 'Page Role', 'idx': 2, 'parenttype': 'Page', 'role': 'Sales Master Manager', 'owner': 'saumil@webnotestech.com', 'docstatus': 0, 'parentfield': 'roles'}, {'modified_by': 'saumil@webnotestech.com', 'name': 'PR000124', 'parent': 'Trash', 'creation': '2010-04-21 10:33:38', 'modified': '2010-09-16 16:50:16', 'doctype': 'Page Role', 'idx': 3, 'parenttype': 'Page', 'role': 'Material Master Manager', 'owner': 'saumil@webnotestech.com', 'docstatus': 0, 'parentfield': 'roles'}, {'modified_by': 'saumil@webnotestech.com', 'name': 'PR000125', 'parent': 'Trash', 'creation': '2010-04-21 10:33:38', 'modified': '2010-09-16 16:50:16', 'doctype': 'Page Role', 'idx': 4, 'parenttype': 'Page', 'role': 'Purchase Master Manager', 'owner': 'saumil@webnotestech.com', 'docstatus': 0, 'parentfield': 'roles'}, {'modified_by': 'saumil@webnotestech.com', 'name': 'PR000126', 'parent': 'Trash', 'creation': '2010-04-21 10:33:38', 'modified': '2010-09-16 16:50:16', 'doctype': 'Page Role', 'idx': 5, 'parenttype': 'Page', 'role': 'Accounts Manager', 'owner': 'saumil@webnotestech.com', 'docstatus': 0, 'parentfield': 'roles'}]
\ No newline at end of file
diff --git a/tools/page/wip_monitor/__init__.py b/tools/page/wip_monitor/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/page/wip_monitor/wip_monitor.txt b/tools/page/wip_monitor/wip_monitor.txt
deleted file mode 100644
index b2394f6fbe..0000000000
--- a/tools/page/wip_monitor/wip_monitor.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'creation': '2010-06-29 10:44:15', 'module': 'Tools', 'doctype': 'Page', 'owner': 'Administrator', 'style': None, 'modified_by': 'Administrator', 'script': None, 'show_in_menu': 0, 'content': None, 'page_name': 'WIP Monitor', 'menu_index': None, 'docstatus': 0, 'parent': None, 'standard': 'Yes', 'icon': None, 'name': 'WIP Monitor', 'idx': None, 'static_content': None, 'modified': '2010-11-09 23:12:33', 'parenttype': None, 'parent_node': None, 'parentfield': None}]
\ No newline at end of file
diff --git a/payroll/search_criteria/employeewise_balance_leave_report/__init__.py b/utilities/doctype/__init__.py
similarity index 100%
rename from payroll/search_criteria/employeewise_balance_leave_report/__init__.py
rename to utilities/doctype/__init__.py
diff --git a/payroll/search_criteria/employeewise_leave_transaction_details/__init__.py b/utilities/doctype/activity_dashboard_control/__init__.py
similarity index 100%
rename from payroll/search_criteria/employeewise_leave_transaction_details/__init__.py
rename to utilities/doctype/activity_dashboard_control/__init__.py
diff --git a/tools/doctype/activity_dashboard_control/activity_dashboard_control.py b/utilities/doctype/activity_dashboard_control/activity_dashboard_control.py
similarity index 100%
rename from tools/doctype/activity_dashboard_control/activity_dashboard_control.py
rename to utilities/doctype/activity_dashboard_control/activity_dashboard_control.py
diff --git a/utilities/doctype/activity_dashboard_control/activity_dashboard_control.txt b/utilities/doctype/activity_dashboard_control/activity_dashboard_control.txt
new file mode 100644
index 0000000000..58f489e9f6
--- /dev/null
+++ b/utilities/doctype/activity_dashboard_control/activity_dashboard_control.txt
@@ -0,0 +1,30 @@
+# DocType, Activity Dashboard Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Utilities',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 42
+	},
+
+	# DocType, Activity Dashboard Control
+	{
+		'doctype': 'DocType',
+		'name': 'Activity Dashboard Control'
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/expense_vouchers/__init__.py b/utilities/doctype/address/__init__.py
similarity index 100%
rename from payroll/search_criteria/expense_vouchers/__init__.py
rename to utilities/doctype/address/__init__.py
diff --git a/tools/doctype/address/address.js b/utilities/doctype/address/address.js
similarity index 100%
rename from tools/doctype/address/address.js
rename to utilities/doctype/address/address.js
diff --git a/tools/doctype/address/address.py b/utilities/doctype/address/address.py
similarity index 100%
rename from tools/doctype/address/address.py
rename to utilities/doctype/address/address.py
diff --git a/utilities/doctype/address/address.txt b/utilities/doctype/address/address.txt
new file mode 100644
index 0000000000..e7ff8cce1e
--- /dev/null
+++ b/utilities/doctype/address/address.txt
@@ -0,0 +1,306 @@
+# DocType, Address
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2011-05-24 10:14:48',
+		'docstatus': 0,
+		'modified': '2011-06-09 12:28:53',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1307602735',
+		'allow_trash': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'in_dialog': 1,
+		'module': 'Utilities',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'version': 42
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Address',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'Address',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'All',
+		'write': 1
+	},
+
+	# DocType, Address
+	{
+		'doctype': 'DocType',
+		'name': 'Address'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Address Details',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'e.g. Office, Billing, Shipping',
+		'doctype': 'DocField',
+		'fieldname': 'address_type',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Address Type',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'address_line1',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Address Line1',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'address_line2',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'Address Line2',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'city',
+		'fieldtype': 'Data',
+		'idx': 5,
+		'in_filter': 1,
+		'label': 'City/Town',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'pincode',
+		'fieldtype': 'Data',
+		'idx': 6,
+		'in_filter': 1,
+		'label': 'Pincode',
+		'permlevel': 0,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'country',
+		'fieldtype': 'Select',
+		'idx': 7,
+		'in_filter': 1,
+		'label': 'Country',
+		'options': 'link:Country',
+		'permlevel': 0,
+		'reqd': 1,
+		'search_index': 1,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldname': 'state',
+		'fieldtype': 'Data',
+		'idx': 8,
+		'in_filter': 1,
+		'label': 'State',
+		'options': 'Suggest',
+		'permlevel': 0,
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 9,
+		'permlevel': 0,
+		'print_hide': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'phone',
+		'fieldtype': 'Data',
+		'idx': 10,
+		'label': 'Phone',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'email_id',
+		'fieldtype': 'Data',
+		'idx': 11,
+		'label': 'Email Id',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fax',
+		'fieldtype': 'Data',
+		'idx': 12,
+		'label': 'Fax',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.supplier && !doc.sales_partner',
+		'doctype': 'DocField',
+		'fieldname': 'customer',
+		'fieldtype': 'Link',
+		'idx': 13,
+		'label': 'Customer',
+		'options': 'Customer',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.supplier && !doc.sales_partner',
+		'doctype': 'DocField',
+		'fieldname': 'customer_name',
+		'fieldtype': 'Data',
+		'idx': 14,
+		'label': 'Customer Name',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.customer && !doc.sales_partner',
+		'doctype': 'DocField',
+		'fieldname': 'supplier',
+		'fieldtype': 'Link',
+		'idx': 15,
+		'label': 'Supplier',
+		'options': 'Supplier',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.customer && !doc.sales_partner',
+		'doctype': 'DocField',
+		'fieldname': 'supplier_name',
+		'fieldtype': 'Data',
+		'idx': 16,
+		'label': 'Supplier Name',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.customer && !doc.supplier',
+		'doctype': 'DocField',
+		'fieldname': 'sales_partner',
+		'fieldtype': 'Link',
+		'idx': 17,
+		'label': 'Sales Partner',
+		'options': 'Sales Partner',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': '0',
+		'description': 'Check to make primary address',
+		'doctype': 'DocField',
+		'fieldname': 'is_primary_address',
+		'fieldtype': 'Check',
+		'idx': 18,
+		'label': 'Is Primary Address',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': '0',
+		'description': 'Check to make Shipping Address',
+		'doctype': 'DocField',
+		'fieldname': 'is_shipping_address',
+		'fieldtype': 'Check',
+		'idx': 19,
+		'label': 'Is Shipping Address',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 20,
+		'label': 'Trash Reason',
+		'permlevel': 0
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/installed_items/__init__.py b/utilities/doctype/contact/__init__.py
similarity index 100%
rename from payroll/search_criteria/installed_items/__init__.py
rename to utilities/doctype/contact/__init__.py
diff --git a/tools/doctype/contact/contact.js b/utilities/doctype/contact/contact.js
similarity index 100%
rename from tools/doctype/contact/contact.js
rename to utilities/doctype/contact/contact.js
diff --git a/tools/doctype/contact/contact.py b/utilities/doctype/contact/contact.py
similarity index 100%
rename from tools/doctype/contact/contact.py
rename to utilities/doctype/contact/contact.py
diff --git a/utilities/doctype/contact/contact.txt b/utilities/doctype/contact/contact.txt
new file mode 100644
index 0000000000..43fa4d7f97
--- /dev/null
+++ b/utilities/doctype/contact/contact.txt
@@ -0,0 +1,339 @@
+# DocType, Contact
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:55',
+		'docstatus': 0,
+		'modified': '2011-05-26 11:00:36',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1306307671',
+		'allow_trash': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'document_type': 'Master',
+		'in_create': 0,
+		'in_dialog': 1,
+		'module': 'Utilities',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'subject': '%(first_name)s %(last_name)s - Email: %(email_id)s | Contact: %(phone)s | Mobile: %(mobile_no)s',
+		'version': 242
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Contact',
+		'parentfield': 'fields',
+		'parenttype': 'DocType'
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Contact',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Contact
+	{
+		'doctype': 'DocType',
+		'name': 'Contact'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'Sales User'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'Purchase User'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 0,
+		'role': 'Sales Master Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 4,
+		'permlevel': 1,
+		'role': 'All',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 5,
+		'permlevel': 2,
+		'role': 'All'
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 6,
+		'permlevel': 0,
+		'role': 'Purchase Master Manager',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'cancel': 1,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 7,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Contact Details',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 2,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'first_name',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'First Name',
+		'oldfieldname': 'first_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'last_name',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'Last Name',
+		'oldfieldname': 'last_name',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.supplier && !doc.sales_partner',
+		'doctype': 'DocField',
+		'fieldname': 'customer',
+		'fieldtype': 'Link',
+		'idx': 5,
+		'label': 'Customer',
+		'oldfieldname': 'customer',
+		'oldfieldtype': 'Link',
+		'options': 'Customer',
+		'permlevel': 0,
+		'print_hide': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.supplier && !doc.sales_partner',
+		'doctype': 'DocField',
+		'fieldname': 'customer_name',
+		'fieldtype': 'Data',
+		'idx': 6,
+		'label': 'Customer Name',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.customer && !doc.sales_partner',
+		'doctype': 'DocField',
+		'fieldname': 'supplier',
+		'fieldtype': 'Link',
+		'idx': 7,
+		'label': 'Supplier',
+		'options': 'Supplier',
+		'permlevel': 0,
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'allow_on_submit': 0,
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.customer && !doc.sales_partner',
+		'doctype': 'DocField',
+		'fieldname': 'supplier_name',
+		'fieldtype': 'Data',
+		'idx': 8,
+		'label': 'Supplier Name',
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'depends_on': 'eval:!doc.customer && !doc.supplier',
+		'doctype': 'DocField',
+		'fieldname': 'sales_partner',
+		'fieldtype': 'Link',
+		'idx': 9,
+		'label': 'Sales Partner',
+		'options': 'Sales Partner',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'default': '0',
+		'depends_on': 'eval:(cint(doc.is_customer) || cint(doc.is_supplier) || cint(doc.is_sales_partner))',
+		'doctype': 'DocField',
+		'fieldname': 'is_primary_contact',
+		'fieldtype': 'Check',
+		'idx': 10,
+		'label': 'Is Primary Contact',
+		'oldfieldname': 'is_primary_contact',
+		'oldfieldtype': 'Select',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 11,
+		'oldfieldtype': 'Column Break',
+		'permlevel': 0,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'email_id',
+		'fieldtype': 'Data',
+		'idx': 12,
+		'label': 'Email Id',
+		'oldfieldname': 'email_id',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'phone',
+		'fieldtype': 'Data',
+		'idx': 13,
+		'label': 'Phone',
+		'oldfieldname': 'contact_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'mobile_no',
+		'fieldtype': 'Data',
+		'idx': 14,
+		'label': 'Mobile No',
+		'oldfieldname': 'mobile_no',
+		'oldfieldtype': 'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Enter department to which this Contact belongs',
+		'doctype': 'DocField',
+		'fieldname': 'department',
+		'fieldtype': 'Data',
+		'idx': 15,
+		'label': 'Department',
+		'options': 'Suggest',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'description': 'Enter designation of this Contact',
+		'doctype': 'DocField',
+		'fieldname': 'designation',
+		'fieldtype': 'Data',
+		'idx': 16,
+		'label': 'Designation',
+		'options': 'Suggest',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'trash_reason',
+		'fieldtype': 'Small Text',
+		'idx': 17,
+		'label': 'Trash Reason',
+		'oldfieldname': 'trash_reason',
+		'oldfieldtype': 'Small Text',
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/monthly_attendance_details/__init__.py b/utilities/doctype/contact_detail/__init__.py
similarity index 100%
rename from payroll/search_criteria/monthly_attendance_details/__init__.py
rename to utilities/doctype/contact_detail/__init__.py
diff --git a/utilities/doctype/contact_detail/contact_detail.txt b/utilities/doctype/contact_detail/contact_detail.txt
new file mode 100644
index 0000000000..306491f650
--- /dev/null
+++ b/utilities/doctype/contact_detail/contact_detail.txt
@@ -0,0 +1,98 @@
+# DocType, Contact Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:56',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'CD/.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Utilities',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'show_in_menu': 0,
+		'version': 5
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Contact Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Contact Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Contact Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_person',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Contact Person',
+		'oldfieldname': 'contact_person',
+		'oldfieldtype': 'Data',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'contact_no',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Contact No',
+		'oldfieldname': 'contact_no',
+		'oldfieldtype': 'Data',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'department',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Department',
+		'oldfieldname': 'department',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'designation',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'Designation',
+		'oldfieldname': 'designation',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'email_id',
+		'fieldtype': 'Small Text',
+		'idx': 5,
+		'label': 'Email Id',
+		'oldfieldname': 'email_id',
+		'oldfieldtype': 'Small Text'
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/monthly_salary_register/__init__.py b/utilities/doctype/doctype_label/__init__.py
similarity index 100%
rename from payroll/search_criteria/monthly_salary_register/__init__.py
rename to utilities/doctype/doctype_label/__init__.py
diff --git a/application_internal/doctype/doctype_label/doctype_label.txt b/utilities/doctype/doctype_label/doctype_label.txt
similarity index 100%
rename from application_internal/doctype/doctype_label/doctype_label.txt
rename to utilities/doctype/doctype_label/doctype_label.txt
diff --git a/payroll/search_criteria/monthly_salary_register1/__init__.py b/utilities/doctype/doctype_property_setter/__init__.py
similarity index 100%
rename from payroll/search_criteria/monthly_salary_register1/__init__.py
rename to utilities/doctype/doctype_property_setter/__init__.py
diff --git a/application_internal/doctype/doctype_property_setter/doctype_property_setter.py b/utilities/doctype/doctype_property_setter/doctype_property_setter.py
similarity index 100%
rename from application_internal/doctype/doctype_property_setter/doctype_property_setter.py
rename to utilities/doctype/doctype_property_setter/doctype_property_setter.py
diff --git a/utilities/doctype/doctype_property_setter/doctype_property_setter.txt b/utilities/doctype/doctype_property_setter/doctype_property_setter.txt
new file mode 100644
index 0000000000..f0d17d8ab2
--- /dev/null
+++ b/utilities/doctype/doctype_property_setter/doctype_property_setter.txt
@@ -0,0 +1,138 @@
+# DocType, DocType Property Setter
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:59',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Utilities',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 4
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'DocType Property Setter',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'DocType Property Setter',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocType, DocType Property Setter
+	{
+		'doctype': 'DocType',
+		'name': 'DocType Property Setter'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'select_doctype',
+		'fieldtype': 'Select',
+		'idx': 1,
+		'label': 'Select DocType',
+		'options': 'link:DocType'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 2,
+		'label': 'Get Details',
+		'options': 'get_details',
+		'trigger': 'Server'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'module',
+		'fieldtype': 'Link',
+		'idx': 3,
+		'label': 'Module',
+		'options': 'Module Def'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'autoname',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'Autoname'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'page_style',
+		'fieldtype': 'Select',
+		'idx': 5,
+		'label': 'Page Style',
+		'options': 'Simple\nTabbed\nTray'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'show_print_format_first',
+		'fieldtype': 'Check',
+		'idx': 6,
+		'label': 'Show Print Format First'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text Editor',
+		'idx': 7,
+		'label': 'Description',
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 8,
+		'label': 'Update',
+		'options': 'update_dt',
+		'trigger': 'Server'
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/monthly_salary_register2/__init__.py b/utilities/doctype/file_browser_control/__init__.py
similarity index 100%
rename from payroll/search_criteria/monthly_salary_register2/__init__.py
rename to utilities/doctype/file_browser_control/__init__.py
diff --git a/tools/doctype/file_browser_control/file_browser_control.py b/utilities/doctype/file_browser_control/file_browser_control.py
similarity index 100%
rename from tools/doctype/file_browser_control/file_browser_control.py
rename to utilities/doctype/file_browser_control/file_browser_control.py
diff --git a/utilities/doctype/file_browser_control/file_browser_control.txt b/utilities/doctype/file_browser_control/file_browser_control.txt
new file mode 100644
index 0000000000..2988e17102
--- /dev/null
+++ b/utilities/doctype/file_browser_control/file_browser_control.txt
@@ -0,0 +1,31 @@
+# DocType, File Browser Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2009-10-28 10:25:03',
+		'docstatus': 0,
+		'modified': '2010-12-27 11:09:53',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Utilities',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 81
+	},
+
+	# DocType, File Browser Control
+	{
+		'doctype': 'DocType',
+		'name': 'File Browser Control'
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/new_or_left_employees_for_a_month/__init__.py b/utilities/doctype/gl_mapper/__init__.py
similarity index 100%
rename from payroll/search_criteria/new_or_left_employees_for_a_month/__init__.py
rename to utilities/doctype/gl_mapper/__init__.py
diff --git a/utilities/doctype/gl_mapper/gl_mapper.txt b/utilities/doctype/gl_mapper/gl_mapper.txt
new file mode 100644
index 0000000000..e1ce2a9e8b
--- /dev/null
+++ b/utilities/doctype/gl_mapper/gl_mapper.txt
@@ -0,0 +1,98 @@
+# DocType, GL Mapper
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:03',
+		'docstatus': 0,
+		'modified': '2011-05-10 11:16:01',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1305006361',
+		'autoname': 'field:doc_type',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'Utilities',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 3
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'GL Mapper',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'GL Mapper',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1
+	},
+
+	# DocType, GL Mapper
+	{
+		'doctype': 'DocType',
+		'name': 'GL Mapper'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'role': 'Accounts User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'doc_type',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Doc Type',
+		'oldfieldname': 'doc_type',
+		'oldfieldtype': 'Link',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fields',
+		'fieldtype': 'Table',
+		'idx': 2,
+		'label': 'Fields',
+		'oldfieldname': 'fields',
+		'oldfieldtype': 'Table',
+		'options': 'GL Mapper Detail'
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/pending_appraisals/__init__.py b/utilities/doctype/gl_mapper_detail/__init__.py
similarity index 100%
rename from payroll/search_criteria/pending_appraisals/__init__.py
rename to utilities/doctype/gl_mapper_detail/__init__.py
diff --git a/utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt b/utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt
new file mode 100644
index 0000000000..404e8fcb47
--- /dev/null
+++ b/utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt
@@ -0,0 +1,225 @@
+# DocType, GL Mapper Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:03',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'GLMDetail.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Utilities',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 3
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Data',
+		'name': '__common__',
+		'oldfieldtype': 'Data',
+		'parent': 'GL Mapper Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, GL Mapper Detail
+	{
+		'doctype': 'DocType',
+		'name': 'GL Mapper Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'table_field',
+		'idx': 1,
+		'label': 'Table Field',
+		'oldfieldname': 'table_field'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'account',
+		'idx': 2,
+		'label': 'Account',
+		'oldfieldname': 'account',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'debit',
+		'idx': 3,
+		'label': 'Debit',
+		'oldfieldname': 'debit',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'credit',
+		'idx': 4,
+		'label': 'Credit',
+		'oldfieldname': 'credit',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'cost_center',
+		'idx': 5,
+		'label': 'Cost Center',
+		'oldfieldname': 'cost_center',
+		'reqd': 0
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'against',
+		'idx': 6,
+		'label': 'Against',
+		'oldfieldname': 'against',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'remarks',
+		'idx': 7,
+		'label': 'Remarks',
+		'no_copy': 1,
+		'oldfieldname': 'remarks',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'voucher_type',
+		'idx': 8,
+		'label': 'Voucher Type',
+		'oldfieldname': 'voucher_type',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'voucher_no',
+		'idx': 9,
+		'label': 'Voucher No',
+		'oldfieldname': 'voucher_no',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'description': 'The date at which current entry will get or has actually executed.',
+		'doctype': 'DocField',
+		'fieldname': 'posting_date',
+		'idx': 10,
+		'label': 'Posting Date',
+		'oldfieldname': 'posting_date',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'description': 'The date at which current entry is made in system.',
+		'doctype': 'DocField',
+		'fieldname': 'transaction_date',
+		'idx': 11,
+		'label': 'Transaction Date',
+		'oldfieldname': 'transaction_date',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'aging_date',
+		'idx': 12,
+		'label': 'Aging Date',
+		'oldfieldname': 'aging_date',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'fiscal_year',
+		'idx': 13,
+		'in_filter': 1,
+		'label': 'Fiscal Year',
+		'oldfieldname': 'fiscal_year',
+		'reqd': 1,
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'against_voucher',
+		'idx': 14,
+		'label': 'Against Voucher',
+		'oldfieldname': 'against_voucher'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'against_voucher_type',
+		'idx': 15,
+		'label': 'Against Voucher Type',
+		'oldfieldname': 'against_voucher_type'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'idx': 16,
+		'in_filter': 1,
+		'label': 'Company',
+		'oldfieldname': 'company',
+		'search_index': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_opening',
+		'idx': 17,
+		'label': 'Is Opening',
+		'oldfieldname': 'is_opening'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_advance',
+		'idx': 18,
+		'label': 'Is Advance',
+		'oldfieldname': 'is_advance'
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/pending_expense_vouchers/__init__.py b/utilities/doctype/menu_control/__init__.py
similarity index 100%
rename from payroll/search_criteria/pending_expense_vouchers/__init__.py
rename to utilities/doctype/menu_control/__init__.py
diff --git a/application_internal/doctype/menu_control/menu_control.js b/utilities/doctype/menu_control/menu_control.js
similarity index 100%
rename from application_internal/doctype/menu_control/menu_control.js
rename to utilities/doctype/menu_control/menu_control.js
diff --git a/application_internal/doctype/menu_control/menu_control.py b/utilities/doctype/menu_control/menu_control.py
similarity index 100%
rename from application_internal/doctype/menu_control/menu_control.py
rename to utilities/doctype/menu_control/menu_control.py
diff --git a/utilities/doctype/menu_control/menu_control.txt b/utilities/doctype/menu_control/menu_control.txt
new file mode 100644
index 0000000000..37d63ad1d3
--- /dev/null
+++ b/utilities/doctype/menu_control/menu_control.txt
@@ -0,0 +1,31 @@
+# DocType, Menu Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2009-06-09 13:43:49',
+		'docstatus': 0,
+		'modified': '2011-01-03 12:01:42',
+		'modified_by': 'sneha@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Utilities',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 38
+	},
+
+	# DocType, Menu Control
+	{
+		'doctype': 'DocType',
+		'name': 'Menu Control'
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/salary_register/__init__.py b/utilities/doctype/patch_util/__init__.py
similarity index 100%
rename from payroll/search_criteria/salary_register/__init__.py
rename to utilities/doctype/patch_util/__init__.py
diff --git a/application_internal/doctype/patch_util/patch_util.py b/utilities/doctype/patch_util/patch_util.py
similarity index 100%
rename from application_internal/doctype/patch_util/patch_util.py
rename to utilities/doctype/patch_util/patch_util.py
diff --git a/utilities/doctype/patch_util/patch_util.txt b/utilities/doctype/patch_util/patch_util.txt
new file mode 100644
index 0000000000..3ed62b7ace
--- /dev/null
+++ b/utilities/doctype/patch_util/patch_util.txt
@@ -0,0 +1,30 @@
+# DocType, Patch Util
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-10-27 14:33:29',
+		'docstatus': 0,
+		'modified': '2010-12-21 10:19:44',
+		'modified_by': 'sneha@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Utilities',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 5
+	},
+
+	# DocType, Patch Util
+	{
+		'doctype': 'DocType',
+		'name': 'Patch Util'
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/salary_slips/__init__.py b/utilities/doctype/production_tips_common/__init__.py
similarity index 100%
rename from payroll/search_criteria/salary_slips/__init__.py
rename to utilities/doctype/production_tips_common/__init__.py
diff --git a/application_internal/doctype/production_tips_common/production_tips_common.js b/utilities/doctype/production_tips_common/production_tips_common.js
similarity index 100%
rename from application_internal/doctype/production_tips_common/production_tips_common.js
rename to utilities/doctype/production_tips_common/production_tips_common.js
diff --git a/utilities/doctype/production_tips_common/production_tips_common.txt b/utilities/doctype/production_tips_common/production_tips_common.txt
new file mode 100644
index 0000000000..13209ad547
--- /dev/null
+++ b/utilities/doctype/production_tips_common/production_tips_common.txt
@@ -0,0 +1,30 @@
+# DocType, Production Tips Common
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:14',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Utilities',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 37
+	},
+
+	# DocType, Production Tips Common
+	{
+		'doctype': 'DocType',
+		'name': 'Production Tips Common'
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/salary_slips1/__init__.py b/utilities/doctype/profile_control/__init__.py
similarity index 100%
rename from payroll/search_criteria/salary_slips1/__init__.py
rename to utilities/doctype/profile_control/__init__.py
diff --git a/application_internal/doctype/profile_control/profile_control.py b/utilities/doctype/profile_control/profile_control.py
similarity index 100%
rename from application_internal/doctype/profile_control/profile_control.py
rename to utilities/doctype/profile_control/profile_control.py
diff --git a/utilities/doctype/profile_control/profile_control.txt b/utilities/doctype/profile_control/profile_control.txt
new file mode 100644
index 0000000000..caaa4409bd
--- /dev/null
+++ b/utilities/doctype/profile_control/profile_control.txt
@@ -0,0 +1,31 @@
+# DocType, Profile Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2009-05-29 12:19:21',
+		'docstatus': 0,
+		'modified': '2010-11-03 11:03:11',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Utilities',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 12
+	},
+
+	# DocType, Profile Control
+	{
+		'doctype': 'DocType',
+		'name': 'Profile Control'
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/salary_structure_details/__init__.py b/utilities/doctype/receiver_detail/__init__.py
similarity index 100%
rename from payroll/search_criteria/salary_structure_details/__init__.py
rename to utilities/doctype/receiver_detail/__init__.py
diff --git a/utilities/doctype/receiver_detail/receiver_detail.txt b/utilities/doctype/receiver_detail/receiver_detail.txt
new file mode 100644
index 0000000000..9e330ba3fb
--- /dev/null
+++ b/utilities/doctype/receiver_detail/receiver_detail.txt
@@ -0,0 +1,72 @@
+# DocType, Receiver Detail
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:19',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'istable': 1,
+		'module': 'Utilities',
+		'name': '__common__',
+		'section_style': 'Tray',
+		'server_code_error': ' ',
+		'version': 2
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Data',
+		'name': '__common__',
+		'oldfieldtype': 'Data',
+		'parent': 'Receiver Detail',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Receiver Detail
+	{
+		'doctype': 'DocType',
+		'name': 'Receiver Detail'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'customer_name',
+		'idx': 1,
+		'label': 'Customer Name',
+		'oldfieldname': 'customer_name'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'receiver_name',
+		'idx': 2,
+		'label': 'Receiver Name',
+		'oldfieldname': 'receiver_name',
+		'width': '350px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'mobile_no',
+		'idx': 3,
+		'label': 'Mobile No',
+		'oldfieldname': 'mobile_no',
+		'reqd': 1,
+		'width': '200px'
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/salary_structure_details3/__init__.py b/utilities/doctype/rename_tool/__init__.py
old mode 100644
new mode 100755
similarity index 100%
rename from payroll/search_criteria/salary_structure_details3/__init__.py
rename to utilities/doctype/rename_tool/__init__.py
diff --git a/tools/doctype/rename_tool/rename_tool.js b/utilities/doctype/rename_tool/rename_tool.js
similarity index 100%
rename from tools/doctype/rename_tool/rename_tool.js
rename to utilities/doctype/rename_tool/rename_tool.js
diff --git a/tools/doctype/rename_tool/rename_tool.py b/utilities/doctype/rename_tool/rename_tool.py
similarity index 100%
rename from tools/doctype/rename_tool/rename_tool.py
rename to utilities/doctype/rename_tool/rename_tool.py
diff --git a/utilities/doctype/rename_tool/rename_tool.txt b/utilities/doctype/rename_tool/rename_tool.txt
new file mode 100755
index 0000000000..3a7a27cf0e
--- /dev/null
+++ b/utilities/doctype/rename_tool/rename_tool.txt
@@ -0,0 +1,102 @@
+# DocType, Rename Tool
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2011-06-23 11:03:25',
+		'docstatus': 0,
+		'modified': '2011-06-23 11:03:25',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308739509',
+		'allow_email': 1,
+		'allow_print': 1,
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'hide_heading': 0,
+		'hide_toolbar': 0,
+		'issingle': 1,
+		'module': 'Utilities',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'version': 6
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Rename Tool',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'Rename Tool',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocType, Rename Tool
+	{
+		'doctype': 'DocType',
+		'name': 'Rename Tool'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'select_doctype',
+		'fieldtype': 'Select',
+		'idx': 1,
+		'label': 'Select DocType',
+		'options': 'link:DocType'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'document_to_rename',
+		'fieldtype': 'Link',
+		'idx': 2,
+		'label': 'Document to rename'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'new_name',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'New Name'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 4,
+		'label': 'Rename',
+		'options': 'rename'
+	}
+]
\ No newline at end of file
diff --git a/payroll/search_criteria/salary_structure_details4/__init__.py b/utilities/doctype/reposting_tool/__init__.py
similarity index 100%
rename from payroll/search_criteria/salary_structure_details4/__init__.py
rename to utilities/doctype/reposting_tool/__init__.py
diff --git a/tools/doctype/reposting_tool/reposting_tool.js b/utilities/doctype/reposting_tool/reposting_tool.js
similarity index 100%
rename from tools/doctype/reposting_tool/reposting_tool.js
rename to utilities/doctype/reposting_tool/reposting_tool.js
diff --git a/tools/doctype/reposting_tool/reposting_tool.py b/utilities/doctype/reposting_tool/reposting_tool.py
similarity index 100%
rename from tools/doctype/reposting_tool/reposting_tool.py
rename to utilities/doctype/reposting_tool/reposting_tool.py
diff --git a/utilities/doctype/reposting_tool/reposting_tool.txt b/utilities/doctype/reposting_tool/reposting_tool.txt
new file mode 100644
index 0000000000..788b11f69c
--- /dev/null
+++ b/utilities/doctype/reposting_tool/reposting_tool.txt
@@ -0,0 +1,96 @@
+# DocType, Reposting Tool
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:19',
+		'docstatus': 0,
+		'modified': '2011-04-19 11:50:09',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'_last_update': '1308741898',
+		'allow_copy': 1,
+		'allow_email': 1,
+		'allow_print': 1,
+		'colour': 'Light Blue:DEF',
+		'doctype': 'DocType',
+		'hide_toolbar': 1,
+		'in_create': 0,
+		'issingle': 1,
+		'module': 'Utilities',
+		'name': '__common__',
+		'read_only': 1,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 1,
+		'version': 174
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'Reposting Tool',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'Reposting Tool',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocType, Reposting Tool
+	{
+		'doctype': 'DocType',
+		'name': 'Reposting Tool'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'recalculate_mar_&_actual_qty',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Recalculate MAR & Actual Qty'
+	},
+
+	# DocField
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 2,
+		'label': 'Repost Bin',
+		'trigger': 'Client'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Button',
+		'idx': 3,
+		'label': 'Repost Account Balances',
+		'trigger': 'Client'
+	}
+]
\ No newline at end of file
diff --git a/projects/search_criteria/projectwise_delivered_qty_and_costs1/__init__.py b/utilities/doctype/sms_center/__init__.py
similarity index 100%
rename from projects/search_criteria/projectwise_delivered_qty_and_costs1/__init__.py
rename to utilities/doctype/sms_center/__init__.py
diff --git a/application_internal/doctype/sms_center/sms_center.js b/utilities/doctype/sms_center/sms_center.js
similarity index 100%
rename from application_internal/doctype/sms_center/sms_center.js
rename to utilities/doctype/sms_center/sms_center.js
diff --git a/application_internal/doctype/sms_center/sms_center.py b/utilities/doctype/sms_center/sms_center.py
similarity index 100%
rename from application_internal/doctype/sms_center/sms_center.py
rename to utilities/doctype/sms_center/sms_center.py
diff --git a/application_internal/doctype/sms_center/sms_center.txt b/utilities/doctype/sms_center/sms_center.txt
similarity index 100%
rename from application_internal/doctype/sms_center/sms_center.txt
rename to utilities/doctype/sms_center/sms_center.txt
diff --git a/projects/search_criteria/projectwise_delivered_qty_and_costs2/__init__.py b/utilities/doctype/sms_control/__init__.py
similarity index 100%
rename from projects/search_criteria/projectwise_delivered_qty_and_costs2/__init__.py
rename to utilities/doctype/sms_control/__init__.py
diff --git a/tools/doctype/sms_control/sms_control.js b/utilities/doctype/sms_control/sms_control.js
similarity index 100%
rename from tools/doctype/sms_control/sms_control.js
rename to utilities/doctype/sms_control/sms_control.js
diff --git a/tools/doctype/sms_control/sms_control.py b/utilities/doctype/sms_control/sms_control.py
similarity index 100%
rename from tools/doctype/sms_control/sms_control.py
rename to utilities/doctype/sms_control/sms_control.py
diff --git a/utilities/doctype/sms_control/sms_control.txt b/utilities/doctype/sms_control/sms_control.txt
new file mode 100644
index 0000000000..7f8d071acb
--- /dev/null
+++ b/utilities/doctype/sms_control/sms_control.txt
@@ -0,0 +1,59 @@
+# DocType, SMS Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:24',
+		'docstatus': 0,
+		'modified': '2011-01-11 18:40:35',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 0,
+		'issingle': 1,
+		'module': 'Utilities',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0,
+		'version': 8
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'SMS Control',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'role': 'System Manager'
+	},
+
+	# DocType, SMS Control
+	{
+		'doctype': 'DocType',
+		'name': 'SMS Control'
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1
+	}
+]
\ No newline at end of file
diff --git a/projects/search_criteria/projectwise_pending_qty_and_costs1/__init__.py b/utilities/doctype/sms_log/__init__.py
similarity index 100%
rename from projects/search_criteria/projectwise_pending_qty_and_costs1/__init__.py
rename to utilities/doctype/sms_log/__init__.py
diff --git a/utilities/doctype/sms_log/sms_log.txt b/utilities/doctype/sms_log/sms_log.txt
new file mode 100644
index 0000000000..c2b7ba996e
--- /dev/null
+++ b/utilities/doctype/sms_log/sms_log.txt
@@ -0,0 +1,130 @@
+# DocType, SMS Log
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2011-01-11 13:00:09',
+		'docstatus': 0,
+		'modified': '2011-01-11 12:51:46',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'SMSLOG/.########',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'Utilities',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'version': 3
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'SMS Log',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'SMS Log',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'System Manager',
+		'write': 1
+	},
+
+	# DocType, SMS Log
+	{
+		'doctype': 'DocType',
+		'name': 'SMS Log'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 1,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sender_name',
+		'fieldtype': 'Data',
+		'idx': 2,
+		'label': 'Sender Name'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'sent_on',
+		'fieldtype': 'Date',
+		'idx': 3,
+		'label': 'Sent On'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'receiver_list',
+		'fieldtype': 'Small Text',
+		'idx': 4,
+		'label': 'Receiver List'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'idx': 5,
+		'width': '50%'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'no_of_requested_sms',
+		'fieldtype': 'Int',
+		'idx': 6,
+		'label': 'No of Requested SMS'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'no_of_sent_sms',
+		'fieldtype': 'Int',
+		'idx': 7,
+		'label': 'No of Sent SMS'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'message',
+		'fieldtype': 'Small Text',
+		'idx': 8,
+		'label': 'Message'
+	}
+]
\ No newline at end of file
diff --git a/projects/search_criteria/projectwise_pending_qty_and_costs2/__init__.py b/utilities/doctype/sso_control/__init__.py
similarity index 100%
rename from projects/search_criteria/projectwise_pending_qty_and_costs2/__init__.py
rename to utilities/doctype/sso_control/__init__.py
diff --git a/application_internal/doctype/sso_control/sso_control.py b/utilities/doctype/sso_control/sso_control.py
similarity index 100%
rename from application_internal/doctype/sso_control/sso_control.py
rename to utilities/doctype/sso_control/sso_control.py
diff --git a/utilities/doctype/sso_control/sso_control.txt b/utilities/doctype/sso_control/sso_control.txt
new file mode 100644
index 0000000000..ee0224e8e4
--- /dev/null
+++ b/utilities/doctype/sso_control/sso_control.txt
@@ -0,0 +1,30 @@
+# DocType, SSO Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:24',
+		'docstatus': 0,
+		'modified': '2010-12-20 19:44:29',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Utilities',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 1
+	},
+
+	# DocType, SSO Control
+	{
+		'doctype': 'DocType',
+		'name': 'SSO Control'
+	}
+]
\ No newline at end of file
diff --git a/roles/__init__.py b/utilities/doctype/todo_item/__init__.py
similarity index 100%
rename from roles/__init__.py
rename to utilities/doctype/todo_item/__init__.py
diff --git a/utilities/doctype/todo_item/todo_item.txt b/utilities/doctype/todo_item/todo_item.txt
new file mode 100644
index 0000000000..28745ae3ef
--- /dev/null
+++ b/utilities/doctype/todo_item/todo_item.txt
@@ -0,0 +1,142 @@
+# DocType, ToDo Item
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2009-05-12 11:19:11',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'yogesh@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'TDI.########',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 1,
+		'module': 'Utilities',
+		'name': '__common__',
+		'read_only': 1,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 0
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'ToDo Item',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'ToDo Item',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'All'
+	},
+
+	# DocType, ToDo Item
+	{
+		'doctype': 'DocType',
+		'name': 'ToDo Item'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'description',
+		'fieldtype': 'Text',
+		'idx': 1,
+		'label': 'Description',
+		'oldfieldname': 'description',
+		'oldfieldtype': 'Text',
+		'width': '300px'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'date',
+		'fieldtype': 'Date',
+		'idx': 2,
+		'label': 'Date',
+		'oldfieldname': 'date',
+		'oldfieldtype': 'Date',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'priority',
+		'fieldtype': 'Data',
+		'idx': 3,
+		'label': 'Priority',
+		'oldfieldname': 'priority',
+		'oldfieldtype': 'Data',
+		'reqd': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reference_type',
+		'fieldtype': 'Data',
+		'idx': 4,
+		'label': 'Reference Type',
+		'oldfieldname': 'reference_type',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'reference_name',
+		'fieldtype': 'Data',
+		'idx': 5,
+		'label': 'Reference Name',
+		'oldfieldname': 'reference_name',
+		'oldfieldtype': 'Data'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'checked',
+		'fieldtype': 'Check',
+		'idx': 6,
+		'label': 'Checked',
+		'oldfieldname': 'checked',
+		'oldfieldtype': 'Check'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'role',
+		'fieldtype': 'Link',
+		'idx': 7,
+		'label': 'Role',
+		'oldfieldname': 'role',
+		'oldfieldtype': 'Link',
+		'options': 'Role'
+	}
+]
\ No newline at end of file
diff --git a/roles/doctype/__init__.py b/utilities/doctype/trash_control/__init__.py
similarity index 100%
rename from roles/doctype/__init__.py
rename to utilities/doctype/trash_control/__init__.py
diff --git a/tools/doctype/trash_control/trash_control.py b/utilities/doctype/trash_control/trash_control.py
similarity index 100%
rename from tools/doctype/trash_control/trash_control.py
rename to utilities/doctype/trash_control/trash_control.py
diff --git a/utilities/doctype/trash_control/trash_control.txt b/utilities/doctype/trash_control/trash_control.txt
new file mode 100644
index 0000000000..b7a4a1eb2f
--- /dev/null
+++ b/utilities/doctype/trash_control/trash_control.txt
@@ -0,0 +1,32 @@
+# DocType, Trash Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:29',
+		'docstatus': 0,
+		'modified': '2010-12-30 11:44:36',
+		'modified_by': 'umair@iwebnotes.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'in_create': 1,
+		'issingle': 1,
+		'module': 'Utilities',
+		'name': '__common__',
+		'read_only': 1,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 35
+	},
+
+	# DocType, Trash Control
+	{
+		'doctype': 'DocType',
+		'name': 'Trash Control'
+	}
+]
\ No newline at end of file
diff --git a/roles/doctype/role/__init__.py b/utilities/doctype/wn_erp_client_control/__init__.py
similarity index 100%
rename from roles/doctype/role/__init__.py
rename to utilities/doctype/wn_erp_client_control/__init__.py
diff --git a/application_internal/doctype/wn_erp_client_control/wn_erp_client_control.py b/utilities/doctype/wn_erp_client_control/wn_erp_client_control.py
similarity index 100%
rename from application_internal/doctype/wn_erp_client_control/wn_erp_client_control.py
rename to utilities/doctype/wn_erp_client_control/wn_erp_client_control.py
diff --git a/utilities/doctype/wn_erp_client_control/wn_erp_client_control.txt b/utilities/doctype/wn_erp_client_control/wn_erp_client_control.txt
new file mode 100644
index 0000000000..1ab4ed89a9
--- /dev/null
+++ b/utilities/doctype/wn_erp_client_control/wn_erp_client_control.txt
@@ -0,0 +1,124 @@
+# DocType, WN ERP Client Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:30',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'istable': 0,
+		'module': 'Utilities',
+		'name': '__common__',
+		'read_only': 1,
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'show_in_menu': 1,
+		'version': 137
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'name': '__common__',
+		'parent': 'WN ERP Client Control',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# These values are common for all DocPerm
+	{
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'WN ERP Client Control',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1,
+		'role': 'System Manager'
+	},
+
+	# DocType, WN ERP Client Control
+	{
+		'doctype': 'DocType',
+		'name': 'WN ERP Client Control'
+	},
+
+	# DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 1
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'account_start_date',
+		'fieldtype': 'Date',
+		'idx': 1,
+		'label': 'Account Start Date'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'billing_cycle_date',
+		'fieldtype': 'Date',
+		'idx': 2,
+		'label': 'Billing Cycle Date'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'total_users',
+		'fieldtype': 'Int',
+		'idx': 3,
+		'label': 'Total Users'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'credit_balance',
+		'fieldtype': 'Int',
+		'idx': 4,
+		'label': 'Credit Balance'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'is_trial_account',
+		'fieldtype': 'Check',
+		'idx': 5,
+		'label': 'Is Trial Account'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'last_deduction_date',
+		'fieldtype': 'Date',
+		'idx': 6,
+		'label': 'Last Credit Deduction Date'
+	}
+]
\ No newline at end of file
diff --git a/settings/__init__.py b/utilities/page/__init__.py
similarity index 100%
rename from settings/__init__.py
rename to utilities/page/__init__.py
diff --git a/settings/doctype/__init__.py b/utilities/page/file_browser/__init__.py
similarity index 100%
rename from settings/doctype/__init__.py
rename to utilities/page/file_browser/__init__.py
diff --git a/tools/page/file_browser/file_browser.html b/utilities/page/file_browser/file_browser.html
similarity index 100%
rename from tools/page/file_browser/file_browser.html
rename to utilities/page/file_browser/file_browser.html
diff --git a/tools/page/file_browser/file_browser.js b/utilities/page/file_browser/file_browser.js
similarity index 100%
rename from tools/page/file_browser/file_browser.js
rename to utilities/page/file_browser/file_browser.js
diff --git a/utilities/page/file_browser/file_browser.txt b/utilities/page/file_browser/file_browser.txt
new file mode 100644
index 0000000000..b4496f90f6
--- /dev/null
+++ b/utilities/page/file_browser/file_browser.txt
@@ -0,0 +1,121 @@
+# Page, File Browser
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-10-12 15:19:31',
+		'docstatus': 0,
+		'modified': '2010-12-27 11:09:52',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
+		'module': 'Utilities',
+		'name': '__common__',
+		'page_name': 'File Browser',
+		'show_in_menu': 1,
+		'standard': 'Yes'
+	},
+
+	# These values are common for all Page Role
+	{
+		'doctype': 'Page Role',
+		'name': '__common__',
+		'parent': 'File Browser',
+		'parentfield': 'roles',
+		'parenttype': 'Page'
+	},
+
+	# Page, File Browser
+	{
+		'doctype': 'Page',
+		'name': 'File Browser'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 1,
+		'role': 'Administrator'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 2,
+		'role': 'Sales User'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 3,
+		'role': 'Sales Manager'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 4,
+		'role': 'System Manager'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 5,
+		'role': 'Purchase User'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 6,
+		'role': 'Purchase Manager'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 7,
+		'role': 'Accounts User'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 8,
+		'role': 'Accounts Manager'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 9,
+		'role': 'Production User'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 10,
+		'role': 'Production Manager'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 11,
+		'role': 'Material User'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 12,
+		'role': 'Customer'
+	}
+]
\ No newline at end of file
diff --git a/settings/doctype/authorization_control/__init__.py b/utilities/page/messages/__init__.py
similarity index 100%
rename from settings/doctype/authorization_control/__init__.py
rename to utilities/page/messages/__init__.py
diff --git a/tools/page/messages/messages.html b/utilities/page/messages/messages.html
similarity index 100%
rename from tools/page/messages/messages.html
rename to utilities/page/messages/messages.html
diff --git a/tools/page/messages/messages.js b/utilities/page/messages/messages.js
similarity index 100%
rename from tools/page/messages/messages.js
rename to utilities/page/messages/messages.js
diff --git a/tools/page/messages/messages.txt b/utilities/page/messages/messages.txt
similarity index 100%
rename from tools/page/messages/messages.txt
rename to utilities/page/messages/messages.txt
diff --git a/tools/page/messages/messages_static.html b/utilities/page/messages/messages_static.html
similarity index 100%
rename from tools/page/messages/messages_static.html
rename to utilities/page/messages/messages_static.html
diff --git a/settings/doctype/authorization_rule/__init__.py b/utilities/page/trash/__init__.py
similarity index 100%
rename from settings/doctype/authorization_rule/__init__.py
rename to utilities/page/trash/__init__.py
diff --git a/tools/page/trash/trash.html b/utilities/page/trash/trash.html
similarity index 100%
rename from tools/page/trash/trash.html
rename to utilities/page/trash/trash.html
diff --git a/tools/page/trash/trash.js b/utilities/page/trash/trash.js
similarity index 100%
rename from tools/page/trash/trash.js
rename to utilities/page/trash/trash.js
diff --git a/utilities/page/trash/trash.txt b/utilities/page/trash/trash.txt
new file mode 100644
index 0000000000..a0a59cae3d
--- /dev/null
+++ b/utilities/page/trash/trash.txt
@@ -0,0 +1,72 @@
+# Page, Trash
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-10-12 15:19:32',
+		'docstatus': 0,
+		'modified': '2010-12-30 11:44:36',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
+		'module': 'Utilities',
+		'name': '__common__',
+		'page_name': 'Trash',
+		'show_in_menu': 0,
+		'standard': 'Yes'
+	},
+
+	# These values are common for all Page Role
+	{
+		'doctype': 'Page Role',
+		'name': '__common__',
+		'parent': 'Trash',
+		'parentfield': 'roles',
+		'parenttype': 'Page'
+	},
+
+	# Page, Trash
+	{
+		'doctype': 'Page',
+		'name': 'Trash'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 1,
+		'role': 'Administrator'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 2,
+		'role': 'Sales Master Manager'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 3,
+		'role': 'Material Master Manager'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 4,
+		'role': 'Purchase Master Manager'
+	},
+
+	# Page Role
+	{
+		'doctype': 'Page Role',
+		'idx': 5,
+		'role': 'Accounts Manager'
+	}
+]
\ No newline at end of file
diff --git a/settings/doctype/email_settings/__init__.py b/utilities/page/wip_monitor/__init__.py
similarity index 100%
rename from settings/doctype/email_settings/__init__.py
rename to utilities/page/wip_monitor/__init__.py
diff --git a/tools/page/wip_monitor/wip_monitor.html b/utilities/page/wip_monitor/wip_monitor.html
similarity index 100%
rename from tools/page/wip_monitor/wip_monitor.html
rename to utilities/page/wip_monitor/wip_monitor.html
diff --git a/tools/page/wip_monitor/wip_monitor.js b/utilities/page/wip_monitor/wip_monitor.js
similarity index 100%
rename from tools/page/wip_monitor/wip_monitor.js
rename to utilities/page/wip_monitor/wip_monitor.js
diff --git a/utilities/page/wip_monitor/wip_monitor.txt b/utilities/page/wip_monitor/wip_monitor.txt
new file mode 100644
index 0000000000..fc72a7a8b1
--- /dev/null
+++ b/utilities/page/wip_monitor/wip_monitor.txt
@@ -0,0 +1,28 @@
+# Page, WIP Monitor
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-12-14 10:23:29',
+		'docstatus': 0,
+		'modified': '2011-01-04 11:12:39',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
+		'module': 'Utilities',
+		'name': '__common__',
+		'page_name': 'WIP Monitor',
+		'show_in_menu': 0,
+		'standard': 'Yes'
+	},
+
+	# Page, WIP Monitor
+	{
+		'doctype': 'Page',
+		'name': 'WIP Monitor'
+	}
+]
\ No newline at end of file