Rucha Mahabal 21f5680914 fix: merge conflicts

2020-04-07 16:42:50 +05:30

..

__init__.py

[Enhance] Quality Inspection Template (#12988)

2018-02-22 11:03:48 +05:30

add_default_dispatch_notification_template.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

add_default_email_template_for_leave.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

add_expense_claim_default_account.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

add_healthcare_service_unit_tree_root.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

add_index_on_nestedset_doctypes.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

add_item_group_defaults.py

Defaults in Item Group (#14874)

2018-07-17 18:01:44 +05:30

add_market_segments.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

add_permissions_in_gst_settings.py

fix: merge conflicts

2020-04-07 16:42:50 +05:30

add_sales_stages.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

check_buying_selling_in_currency_exchange.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

create_default_success_action.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

create_department_records_for_each_company.py

fix: reload docs before creating custom fields (#17586)

2019-05-15 11:39:41 +05:30

create_salary_structure_assignments.py

fix: fixed salary structure assignment patch (#16546)

2019-02-01 12:25:40 +05:30

drop_column_max_days_allowed.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

ewaybill_fields_gst_india.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

hr_ux_cleanups.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

inter_state_field_for_gst.py

fix: reload docs before creating custom fields (#17586)

2019-05-15 11:39:41 +05:30

make_asset_finance_book_against_old_entries.py

Fixed asset refactor (#19369)

2019-11-18 11:46:55 +05:30

make_italian_localization_fields.py

Merge branch 'master' into develop

2019-03-28 13:54:34 +05:30

make_job_card.py

job card patch use orm

2018-09-10 12:18:51 +05:30

make_location_from_warehouse.py

fix: make location from warehouse patch

2018-10-07 13:08:00 +05:30

make_quality_inspection_template.py

Renamed some salary related fields

2018-04-30 16:21:37 +05:30

merge_land_unit_with_location.py

style: update/standardize rename_doc usage

2019-12-19 19:07:29 +05:30

move_item_defaults_to_child_table_for_multicompany.py

fix: as limit 100 was set in the query therefore not all item's default value moved to the Item Default table

2019-07-02 15:18:02 +05:30

move_leave_approvers_from_employee.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

rebuild_tree_for_company.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

redesign_healthcare_billing_work_flow.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

refactor_autoname_naming.py

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +05:30

refactor_erpnext_shopify.py

refactor(desk_icon): Remove reference and patches to Desktop Icon

2019-02-07 09:58:21 +05:30

refactor_naming_series.py

fix(patch): Check if meta object has naming_series field (#15651)

2018-10-11 16:28:59 +05:30

remove_barcodes_field_from_copy_fields_to_variants.py

fix: Validate invalid fields in Item Variant Settings

2019-02-13 13:02:39 +05:30

remove_modules_setup_page.py

[fix] company listing context

2018-04-05 14:44:16 +05:30

remove_subscriber_doctype.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

rename_additional_salary_component_additional_salary.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

rename_asset_adjustment_doctype.py

style: update/standardize rename_doc usage

2019-12-19 19:07:29 +05:30

rename_bom_wo_fields.py

fix: BOM UX

2019-11-25 18:56:18 +05:30

rename_field_max_days_allowed.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

rename_health_insurance.py

style: update/standardize rename_doc usage

2019-12-19 19:07:29 +05:30

rename_healthcare_doctype_and_fields.py

style: update/standardize rename_doc usage

2019-12-19 19:07:29 +05:30

rename_healthcare_fields.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

rename_members_with_naming_series.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

rename_overproduction_percent_field.py

[Enhance] Provision to set overproduction percentage for work order (#14248)

2018-05-30 15:28:09 +05:30

rename_production_order_to_work_order.py

style: update/standardize rename_doc usage

2019-12-19 19:07:29 +05:30

rename_supplier_type_to_supplier_group.py

style: update/standardize rename_doc usage

2019-12-19 19:07:29 +05:30

renamed_from_to_fields_in_project.py

Added patch

2019-01-18 11:47:31 +05:30

reset_publish_in_hub_for_all_items.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

set_default_email_template_in_hr.py

feat: Password protected salary slips (#17380)

2019-05-08 17:30:08 +05:30

set_department_for_doctypes.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

set_missing_gst_hsn_code.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

set_salary_component_properties.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

set_update_field_and_value_in_workflow_state.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

set_user_permissions_for_department.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

skip_user_permission_check_for_department.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

uom_conversion_data.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

update_account_type_in_party_type.py

Refactor party type (#13831)

2018-05-16 11:02:26 +05:30

update_allow_transfer_for_manufacture.py

Rename BOM and Work order fields (#16209)

2018-12-24 14:38:49 +05:30

update_backflush_subcontract_rm_based_on_bom.py

Renamed subcontract to Send to Subcontractor

2019-03-26 12:52:49 +05:30

update_brand_in_item_price.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

update_delivery_trip_status.py

fix: reload global defaults (#19517)

2019-11-07 14:16:26 +05:30

update_department_lft_rgt.py

[Fix] Patch

2018-11-06 16:32:29 +05:30

update_hub_url.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

update_sales_partner_type.py

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

update_total_qty_field.py

fix: Fix breaking patch on develop branch

2019-06-11 18:35:01 +05:30