Saurabh d7897f1c53 Resolved merge conflicts

2018-07-18 17:08:16 +05:30

..

__init__.py

…

calculate_total_costing_amount.py

…

convert_timelog_to_timesheet.py

…

convert_timelogbatch_to_timesheet.py

…

create_budget_record.py

…

create_warehouse_nestedset.py

…

fix_duplicate_icons.py

…

fix_nonwarehouse_ledger_gl_entries_for_transactions.py

…

make_guardian.py

…

make_is_group_fieldtype_as_check.py

…

merge_account_type_stock_and_warehouse_to_stock.py

…

migrate_mode_of_payments_v6_to_v7.py

…

migrate_schools_to_erpnext.py

…

move_employee_parent_to_child_in_salary_structure.py

…

move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet.py

…

po_status_issue_for_pr_return.py

…

re_route.py

…

remove_administrator_role_in_doctypes.py

…

remove_doctypes_and_reports.py

…

remove_features_setup.py

…

remove_old_earning_deduction_doctypes.py

…

rename_advance_table_fields.py

…

rename_examination_to_assessment.py

…

rename_fee_amount_to_fee_component.py

…

rename_prevdoc_fields.py

…

rename_salary_components.py

…

rename_time_sheet_doctype.py

…

repost_bin_qty_and_item_projected_qty.py

patch fixes

2018-07-13 12:04:06 +05:30

repost_future_gle_for_purchase_invoice.py

…

repost_gle_for_pi_with_update_stock.py

…

repost_gle_for_pos_sales_return.py

…

set_base_amount_in_invoice_payment_table.py

…

set_is_group_for_warehouse.py

…

set_material_request_type_in_item.py

…

set_naming_series_for_timesheet.py

…

set_party_name_in_payment_entry.py

…

set_portal_settings.py

…

setup_account_table_for_expense_claim_type_if_exists.py

…

system_settings_setup_complete.py

…

update_autoname_field.py

…

update_change_amount_account.py

…

update_conversion_factor_in_supplier_quotation_item.py

…

update_home_page.py

…

update_maintenance_module_in_doctype.py

…

update_mins_to_first_response.py

…

update_missing_employee_in_timesheet.py

…

update_mode_of_payment_type.py

…

update_party_status.py

…

update_prevdoc_values_for_supplier_quotation_item.py

…

update_project_in_gl_entry.py

…

update_refdoc_in_landed_cost_voucher.py

…

update_status_for_timesheet.py

…

update_status_of_po_so.py

…

update_status_of_zero_amount_sales_order.py

…

update_timesheet_communications.py

…