Saurabh 03f6b3e588 resolved merge conflicts

2018-01-29 16:25:33 +05:30

..

__init__.py

Rename schools to Education (#11524)

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

add_agriculture_domain.py

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

add_guardian_role_for_parent_portal.py

Set the guardian role automatically. (#12136)

2017-12-22 10:50:10 +05:30

add_non_profit_domain.py

non-profit module cleanups

2017-12-06 12:57:53 +05:30

added_extra_gst_custom_field.py

[Report] GSTR - 1 CDNR Report (#12554)

2018-01-26 11:27:22 +05:30

copy_projects_renamed_fields.py

Patch to copy old field data to new field (#11997)

2017-12-14 12:21:00 +05:30

enabled_regional_print_format_based_on_country.py

[Enhance] New print format for UAE/KSA for vat/excise (#12202)

2017-12-28 14:20:13 +05:30

fichier_des_ecritures_comptables_for_france.py

[fix] ficher_des_ecritures patch

2018-01-24 14:39:04 +05:30

rename_schools_to_education.py

Rename schools to Education (#11524)

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

set_default_payment_terms_based_on_company.py

Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date (#12685)

2018-01-29 16:07:21 +05:30

set_numeric_ranges_in_template_if_blank.py

Set numeric ranges in Item tamplate if blank (#12199)

2017-12-28 12:35:11 +05:30

set_primary_contact_for_customer.py

[enhance] Search customer using primary contact mobile number (#11998)

2017-12-14 13:06:21 +05:30

setup_vat_for_uae_and_saudi_arabia.py

Fix v8 to v10 migration issue (#12177)

2017-12-27 17:14:54 +05:30

update_assessment_plan.py

Assessment module addition (#12417)

2018-01-12 16:21:09 +05:30

update_assessment_result.py

Assessment module addition (#12417)

2018-01-12 16:21:09 +05:30

update_asset_calculate_depreciation.py

patch fix for asset (#12079)

2017-12-18 12:31:23 +05:30

update_lft_rgt_for_employee.py

Employee tree (#11667)

2017-11-29 18:44:02 +05:30

update_reserved_qty_for_purchase_order.py

patch fixed

2018-01-10 14:51:19 +05:30

workflow_leave_application.py

patch fix for leave-workflow

2018-01-25 17:06:14 +05:30