Saurabh d7897f1c53 Resolved merge conflicts

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

..

__init__.py

…

calculate_total_costing_amount.py

[fix] better message for cost center, fixes #6109

2016-08-18 12:50:58 +05:30

convert_timelog_to_timesheet.py

[ Enhance ] Production to Work Order (#12902)

2018-03-20 12:38:43 +05:30

convert_timelogbatch_to_timesheet.py

[ Enhance ] Production to Work Order (#12902)

2018-03-20 12:38:43 +05:30

create_budget_record.py

…

create_warehouse_nestedset.py

Fixed patch create_warehouse_nestedset (#9833)

2017-07-13 12:17:12 +05:30

fix_duplicate_icons.py

[patch] reload desktop icon #6826

2016-11-21 14:29:31 +05:30

fix_nonwarehouse_ledger_gl_entries_for_transactions.py

Python 3 compatibility syntax error fixes (#10519)

2017-08-28 18:17:36 +05:30

make_guardian.py

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

make_is_group_fieldtype_as_check.py

…

merge_account_type_stock_and_warehouse_to_stock.py

…

migrate_mode_of_payments_v6_to_v7.py

patch fix

2016-09-08 12:34:36 +05:30

migrate_schools_to_erpnext.py

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

move_employee_parent_to_child_in_salary_structure.py

Fix patches for Travis

2018-05-21 15:04:13 +05:30

move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet.py

Fixed version conflict

2016-09-23 12:16:31 +05:30

po_status_issue_for_pr_return.py

[Fix] PO status not changed as material return created against them (#6869)

2016-11-16 11:10:10 +05:30

re_route.py

…

remove_administrator_role_in_doctypes.py

…

remove_doctypes_and_reports.py

Update remove_doctypes_and_reports.py

2016-10-05 12:35:11 +05:30

remove_features_setup.py

Patch fixed for legacy migration

2016-09-23 11:08:02 +05:30

remove_old_earning_deduction_doctypes.py

Create columns for custom fields in new table Salary Detail and Component

2016-08-01 12:13:11 +05:30

rename_advance_table_fields.py

[minor] fixes to patches while moving from v5

2016-08-16 10:01:56 +05:30

rename_examination_to_assessment.py

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

rename_fee_amount_to_fee_component.py

[fix] fee component rename patch fix

2016-07-26 15:03:41 +05:30

rename_prevdoc_fields.py

…

rename_salary_components.py

Python 3 compatibility syntax error fixes (#10519)

2017-08-28 18:17:36 +05:30

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

[Enhance] Companywise perpetual inventory setting

2017-06-20 10:21:33 +05:30

repost_gle_for_pi_with_update_stock.py

[Enhance] Companywise perpetual inventory setting

2017-06-20 10:21:33 +05:30

repost_gle_for_pos_sales_return.py

Update repost_gle_for_pos_sales_return.py

2016-09-23 13:11:05 +05:30

set_base_amount_in_invoice_payment_table.py

Update set_base_amount_in_invoice_payment_table.py

2016-11-10 11:24:22 +05:30

set_is_group_for_warehouse.py

…

set_material_request_type_in_item.py

[patch] Set default material request type in Item based on default bom

2016-08-02 18:02:31 +05:30

set_naming_series_for_timesheet.py

…

set_party_name_in_payment_entry.py

Update set_party_name_in_payment_entry.py

2016-09-02 16:17:42 +05:30

set_portal_settings.py

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

setup_account_table_for_expense_claim_type_if_exists.py

Patch fixed for legacy migration

2016-09-23 11:08:02 +05:30

system_settings_setup_complete.py

…

update_autoname_field.py

patch for rename autoname field

2016-11-21 16:52:50 +05:30

update_change_amount_account.py

[Fix] added account for missing change amount account in the sales invoice

2016-09-29 12:55:48 +05:30

update_conversion_factor_in_supplier_quotation_item.py

[Issue] Fixed, supplier quotation item uom conversion

2016-09-06 17:21:38 +05:30

update_home_page.py

Update update_home_page.py

2016-09-20 18:20:58 +05:30

update_maintenance_module_in_doctype.py

…

update_mins_to_first_response.py

…

update_missing_employee_in_timesheet.py

Migrate employee field to timesheet only if it exists in time log

2016-09-02 14:47:14 +05:30

update_mode_of_payment_type.py

[Fix] Mode of payment issue

2016-09-19 23:43:47 +05:30

update_party_status.py

[fixes] errors caught on flake8 (#10126)

2017-07-28 11:39:01 +05:30

update_prevdoc_values_for_supplier_quotation_item.py

…

update_project_in_gl_entry.py

…

update_refdoc_in_landed_cost_voucher.py

[patch] Update refdoc in Landed Cost Voucher

2016-08-01 15:53:36 +05:30

update_status_for_timesheet.py

[Fix] Updated timesheet status

2016-09-02 12:24:54 +05:30

update_status_of_po_so.py

Minor fix in old patch

2018-01-30 15:59:44 +05:30

update_status_of_zero_amount_sales_order.py

[Fix] sales order status showing completed, while it's status was to bill

2016-10-07 13:55:48 +05:30

update_timesheet_communications.py

Added missing file extension

2016-10-07 17:08:03 +05:30