Nabin Hait 5079c9ef47 Fixed merge conflict

2017-02-22 15:31:31 +05:30

..

__init__.py

[Enhancement] Booking of an employee's expense claim (#7267)

2017-02-01 12:02:08 +05:30

arrear_leave_encashment_as_salary_component.py

Accrual Payroll System

2017-02-16 16:30:51 +05:30

contact_address_links.py

[minor] add progress bar in patch

2017-01-19 14:32:36 +05:30

delete_fleet_management_module_def.py

Fleet management moved to HR

2017-01-16 14:38:24 +05:30

empty_supplied_items_for_non_subcontracted.py

[Fix] Cleanup supplied items if supply raw material is set as No

2017-02-16 18:53:23 +05:30

mark_students_active.py

Added ability to disable a student in student group/studnet batch

2017-01-20 19:33:09 +05:30

move_dates_from_salary_structure_to_employee.py

Joining date validation removed from Salary Structure

2017-02-06 14:50:39 +05:30

rename_att_date_attendance.py

Update rename_att_date_attendance.py

2017-02-21 16:01:21 +05:30

rename_evaluation_criteria.py

[minor] school patch fix

2017-02-03 16:05:53 +05:30

set_null_value_to_fields.py

Update set_null_value_to_fields.py

2017-01-20 12:35:22 +05:30

setup_auto_close_settings.py

[minor] Configured Auto Close days for Opportunity and Issue

2017-02-17 14:56:00 +05:30

update_abbr_in_salary_slips.py

Patch to update Salary Detail where Salary Component Abbr is null

2017-01-23 16:12:45 +05:30

update_assessment_modules.py

Renamed Evaluation Criteria to Assessment Criteria

2017-02-01 18:47:36 +05:30

update_attendance_docstatus.py

Fixed Student Attendence

2017-02-21 18:49:00 +05:30

update_doctype_status.py

[Fix] After amend the status become cancelled even if docstatus is zero

2017-01-13 12:51:19 +05:30

update_guardian_name_in_student_master.py

Fixes to update student guardian name patch

2017-01-27 17:44:28 +05:30

update_party_type.py

[Enhancement] Booking of an employee's expense claim (#7267)

2017-02-01 12:02:08 +05:30

update_salary_slips.py

[fix] update_salary_slip.py

2017-01-19 12:51:37 +05:30

update_website_for_variant.py

[fix] item variants not directly shown in website due to route clash

2016-12-27 12:30:30 +05:30