Saurabh eb579a11e1 Fix demo (#14365) ...

* fix demo

* Update asset.json

2018-06-06 15:05:31 +05:30

..

additional_salary

Fixed merge conflict

2018-06-04 11:14:50 +05:30

appraisal

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

appraisal_goal

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

appraisal_template

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

appraisal_template_goal

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

attendance

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

attendance_request

options to fetch from migration

2018-05-25 12:52:23 +05:30

branch

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

compensatory_leave_request

options to fetch from migration

2018-05-25 12:52:23 +05:30

daily_work_summary

Travis (#14354)

2018-06-05 12:56:10 +05:30

daily_work_summary_group

Send daily work summary alert to only enabled users (#14175)

2018-05-23 10:32:55 +05:30

daily_work_summary_group_user

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

department

patch fixes

2018-05-29 16:17:15 +05:30

department_approver

remove set query (#13908)

2018-05-03 16:19:56 +05:30

designation

[minor] remove in_dialog old property

2018-05-16 12:51:22 +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

Treeview permission (#14232)

2018-05-26 09:12:59 +05:30

employee_advance

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

employee_attendance_tool

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

employee_benefit_application

Remove unused imports

2018-05-25 15:20:50 +05:30

employee_benefit_application_detail

Fixed merge conflict

2018-06-04 11:14:50 +05:30

employee_benefit_claim

Fixed merge conflict

2018-06-04 11:14:50 +05:30

employee_boarding_activity

[feature] added the employee onboarding and separation doctype

2018-05-14 20:27:00 +05:30

employee_education

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

employee_external_work_history

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

employee_grade

New doctypes for HR and Accounting (#13652)

2018-04-26 12:12:29 +05:30

employee_health_insurance

Renamed Health Insurance to Employee Health Insurance

2018-04-26 12:16:17 +05:30

employee_incentive

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

employee_internal_work_history

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

employee_onboarding

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

employee_onboarding_activity

[feature] added the employee onboarding and separation doctype

2018-05-14 20:27:00 +05:30

employee_onboarding_template

[feature] added the employee onboarding and separation doctype

2018-05-14 20:27:00 +05:30

employee_promotion

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

employee_property_history

minor fixes

2018-05-07 16:11:35 +05:30

employee_separation

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

employee_separation_template

[feature] added the employee onboarding and separation doctype

2018-05-14 20:27:00 +05:30

employee_tax_exemption_category

New doctypes for HR and Accounting (#13652)

2018-04-26 12:12:29 +05:30

employee_tax_exemption_declaration

minor fix

2018-06-05 09:06:30 +05:30

employee_tax_exemption_declaration_category

Tax Exemption Declaration - HRA Calculation

2018-05-30 13:37:15 +05:30

employee_tax_exemption_proof_submission

codacy fixes

2018-05-31 12:08:14 +05:30

employee_tax_exemption_proof_submission_detail

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

employee_tax_exemption_sub_category

Doctype Employee Tax Exemption Sub Category

2018-05-10 15:02:57 +05:30

employee_transfer

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

employee_transfer_property

New DocTypes for HR Module (#13650)

2018-04-26 12:10:13 +05:30

employment_type

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

expense_claim

Merge branch 'master' into develop

2018-06-06 05:53:19 +00:00

expense_claim_account

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

expense_claim_advance

Employee advance (#11875)

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

expense_claim_detail

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

expense_claim_type

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

holiday

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

holiday_list

removed color field from sales order and work order

2018-05-01 18:56:06 +05:30

hr_settings

Fixed merge conflict

2018-05-05 12:19:14 +05:30

identification_document_type

[rename] Photo ID -> Identification Document

2018-05-16 14:12:22 +05:30

interest

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

job_applicant

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

job_offer

minor fixes

2018-06-05 14:40:48 +05:30

job_offer_term

Rename Offer Letter to Job Offer (#12934)

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

job_opening

Staffing Plan (#14346)

2018-06-05 11:40:58 +05:30

leave_allocation

Earned Leave (#14143)

2018-06-01 16:09:28 +05:30

leave_application

Travis (#14354)

2018-06-05 12:56:10 +05:30

leave_block_list

fix for tests

2018-05-16 13:05:13 +05:30

leave_block_list_allow

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

leave_block_list_date

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

leave_control_panel

set query for department based on company

2018-05-14 16:07:28 +05:30

leave_encashment

Rename - Additional Salary Component to Additional Salary (#14302)

2018-06-04 11:02:53 +05:30

leave_period

Fixed merge conflict

2018-06-04 11:14:50 +05:30

leave_policy

Leave Policy - Validate Annual alloction for leave type

2018-05-08 12:36:51 +05:30

leave_policy_detail

Removed employee table from Salary Structure and added employee name in all forms

2018-04-26 12:14:01 +05:30

leave_type

Update leave_type.json

2018-06-03 15:31:35 +05:30

loan

Travis (#14354)

2018-06-05 12:56:10 +05:30

loan_application

Test case fixes (#14219)

2018-05-26 09:09:02 +05:30

loan_type

Minor fix for ui tests

2017-09-15 19:35:12 +05:30

offer_term

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

payroll_employee_detail

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

payroll_entry

Fixed SQL syntax error in Get Loan Details (#14265)

2018-05-29 15:22:05 +05:30

payroll_period

taxable salary slabs remove from Salary Component and add to Payroll Period

2018-05-25 12:52:23 +05:30

payroll_period_date

New doctypes for HR and Accounting (#13652)

2018-04-26 12:12:29 +05:30

purpose_of_travel

[feature] added travel request doctype in HR

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

repayment_schedule

Loan Management for the Members (Non Profit Module) (#13149)

2018-04-24 12:19:36 +05:30

retention_bonus

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

salary_component

Salary Structure, Slip - make fields readonly (#14358)

2018-06-06 12:04:25 +05:30

salary_detail

Salary Structure, Slip - make fields readonly (#14358)

2018-06-06 12:04:25 +05:30

salary_slip

Salary Structure, Slip - make fields readonly (#14358)

2018-06-06 12:04:25 +05:30

salary_slip_loan

Loan Management for the Members (Non Profit Module) (#13149)

2018-04-24 12:19:36 +05:30

salary_slip_timesheet

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

salary_structure

Fix demo (#14365)

2018-06-06 15:05:31 +05:30

salary_structure_assignment

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

salary_structure_employee

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

shift_assignment

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

shift_request

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

shift_type

Shift Management - Documentation and Tests (#13997)

2018-05-11 21:03:50 +05:30

staffing_plan

Staffing Plan (#14346)

2018-06-05 11:40:58 +05:30

staffing_plan_detail

Staffing Plan (#14346)

2018-06-05 11:40:58 +05:30

taxable_salary_slab

Salary Slip calc tax, except for flexi benefits

2018-05-16 23:01:40 +05:30

training_event

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

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

training_event_employee

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

training_feedback

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

training_program

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

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

training_result

[fixes] email notifications by email alert on training event and result

2017-08-14 11:53:34 +05:30

training_result_employee

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

travel_itinerary

[feature] added travel request doctype in HR

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

travel_request

Test case fixes (#14219)

2018-05-26 09:09:02 +05:30

travel_request_costing

[feature] added travel request doctype in HR

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

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

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

__init__.py

moved modules inside erpnext folder

2013-12-11 10:43:52 +05:30