Nabin Hait c43c95e0aa Fixed merge conflict

2018-03-05 14:54:44 +05:30

..

appraisal

…

appraisal_goal

…

appraisal_template

…

appraisal_template_goal

…

attendance

Leave workflow patch fixes (#12823)

2018-02-12 16:02:57 +05:30

branch

Fix travis (#11882)

2017-12-08 14:57:38 +05:30

daily_work_summary

Daily work summary refactor (#12944)

2018-02-21 15:15:43 +05:30

daily_work_summary_group

Daily work summary refactor (#12944)

2018-02-21 15:15:43 +05:30

daily_work_summary_group_user

Daily work summary refactor (#12944)

2018-02-21 15:15:43 +05:30

department

Fix travis (#11882)

2017-12-08 14:57:38 +05:30

designation

Fix travis (#11882)

2017-12-08 14:57:38 +05:30

driver

[New Feature] Delivery

2017-11-20 10:28:49 +08:00

driving_license_category

[New Feature] Delivery

2017-11-20 10:28:49 +08:00

employee

Set auto created serial nos in incoming transactions in case of multi UOM (#13112)

2018-03-01 10:54:24 +05:30

employee_advance

Make Expense Claim from Employee Advance #13053 (#13074)

2018-03-01 10:50:45 +05:30

employee_attendance_tool

…

employee_education

…

employee_external_work_history

…

employee_internal_work_history

…

employee_leave_approver

…

employee_loan

self.assertEqual

2018-02-28 21:13:51 +05:30

employee_loan_application

self.assertEqual

2018-02-28 21:13:51 +05:30

employment_type

Fix travis (#11882)

2017-12-08 14:57:38 +05:30

expense_claim

Fixed merge conflict

2018-03-05 14:54:44 +05:30

expense_claim_account

…

expense_claim_advance

Employee advance (#11875)

2017-12-14 13:25:57 +05:30

expense_claim_detail

[Minor] Populate Expense Claim Description from Expense Claim Type (#11156)

2017-10-17 17:23:26 +05:30

expense_claim_type

Fix travis (#11882)

2017-12-08 14:57:38 +05:30

holiday

…

holiday_list

…

hr_settings

…

interest

…

job_applicant

Rename Offer Letter to Job Offer (#12934)

2018-02-16 10:49:34 +05:30

job_offer

Rename Offer Letter to Job Offer (#12934)

2018-02-16 10:49:34 +05:30

job_offer_term

Rename Offer Letter to Job Offer (#12934)

2018-02-16 10:49:34 +05:30

job_opening

…

leave_allocation

remove erroneous column breaks (#11522)

2017-11-10 18:54:03 +05:30

leave_application

changes according to the workflow (#13160)

2018-03-05 11:30:53 +05:30

leave_block_list

self.assertEqual

2018-02-28 21:13:51 +05:30

leave_block_list_allow

…

leave_block_list_date

…

leave_control_panel

remove erroneous column breaks (#11522)

2017-11-10 18:54:03 +05:30

leave_type

…

loan_type

…

offer_term

…

payroll_employee_detail

removed process payroll doctype

2017-12-04 16:49:44 +05:30

payroll_entry

Fixed merge conflict

2018-03-05 14:54:44 +05:30

repayment_schedule

…

salary_component

…

salary_detail

…

salary_slip

Fixed merge conflict

2018-03-05 14:54:44 +05:30

salary_slip_loan

Employee loan fixes (#11495)

2017-11-14 17:59:20 +05:30

salary_slip_timesheet

…

salary_structure

self.assertEqual

2018-02-28 21:13:51 +05:30

salary_structure_employee

…

training_event

[Fix] Filter on child table not working in Calendar (#11824)

2017-12-04 11:22:25 +05:30

training_event_employee

…

training_feedback

…

training_program

[minor] Set Rename for Training Program (#11740)

2017-11-28 11:26:23 +05:30

training_result

…

training_result_employee

…

upload_attendance

[minor] remove unnecessary description in upload attendance, fixes #10603

2017-11-14 12:52:53 +05:30

vehicle

[fix] Asset test cases and added make_sales_invoice (#11800)

2017-11-30 15:59:40 +05:30

vehicle_log

[fix] Asset test cases and added make_sales_invoice (#11800)

2017-11-30 15:59:40 +05:30

vehicle_service

…

__init__.py

…