Shreya Shah ec38044fe2 New DocTypes for HR Module (#13650) ...

* New DocType Employee Incentive

* New DocType Shift Type

* New DocType Shift Assignment

* New DocType Shift Assignment Tool

* New DocType Shift Request

* New DocType Salary Structure Assignment

* Added Permissions

* New DocType Employee Lifecycle Process

* New DocType Employee Lifecycle Activity Type

* New DocType Employee Lifecycle Activity

* New DocType Employee Lifecycle Process Template

* New DocType Employee Lifecycle Process Template Detail

* Permissions and Auto Name

* New DocType Staffing Plan

* New DocType Staffing Plan Detail

* Added fields in Job Opening

* New DocType Employee Transfer

* New DocType Employee Promotion

* [minor]

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

..

accounts

[fix] resolved merge conflicts

2018-04-25 11:32:54 +05:30

agriculture

Agriculture module corrections (#13438)

2018-04-02 10:51:53 +05:30

assets

Use range instead xrange (#13128)

2018-02-28 16:12:51 +05:30

buying

[Enhancement] Leave Application and Expense Claim (#13645)

2018-04-19 20:58:52 -08:00

change_log

…

commands

…

config

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

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

controllers

[fix] resolved merge conflicts

2018-04-25 11:32:54 +05:30

crm

Fixed merge conflict

2018-04-13 14:38:57 +05:30

demo

Minor fixes (#13609)

2018-04-12 13:21:16 +05:30

docs

fixed user permission video link (#13774)

2018-04-24 14:12:41 +05:30

domains

[ Enhance ] Production to Work Order (#12902)

2018-03-20 12:38:43 +05:30

education

Student Account Ledger Button (#13591)

2018-04-24 12:12:11 +05:30

erpnext_integrations

Woocommerce Integration (#13217)

2018-04-03 11:17:03 +05:30

healthcare

resolved merge conflicts

2018-04-24 11:16:13 +05:30

hotels

Use range instead xrange (#13128)

2018-02-28 16:12:51 +05:30

hr

New DocTypes for HR Module (#13650)

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

hub

…

hub_node

[hub] add hub settings access regardless

2018-04-05 14:50:42 +05:30

maintenance

Use range instead xrange (#13128)

2018-02-28 16:12:51 +05:30

manufacturing

Typo Fix in Work Order

2018-04-25 13:48:47 +05:30

non_profit

[Fixes] Chapter DocType (#13213)

2018-03-07 16:27:30 +05:30

patches

[patch] ignore validations while creating custom fields for gst via patch

2018-04-26 10:10:03 +05:30

portal

…

projects

[fix] #13589 (#13590)

2018-04-12 13:31:08 +05:30

public

[fix] company listing context

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

regional

[patch] ignore validations while creating custom fields for gst via patch

2018-04-26 10:10:03 +05:30

restaurant

self.assertEqual

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

selling

resolved merge conflicts

2018-04-24 11:16:13 +05:30

setup

fix syntax (#13773)

2018-04-24 12:20:21 +05:30

shopping_cart

[Website] Price in items list and sales uom management (#13335)

2018-03-20 14:28:44 +05:30

startup

removed duplicate keys (#13675)

2018-04-17 12:20:57 +05:30

stock

Merge branch 'master' into develop

2018-04-24 12:09:40 +05:30

support

Email Account field added in Issue

2018-04-13 14:30:26 +05:30

templates

[Website] Price in items list and sales uom management (#13335)

2018-03-20 14:28:44 +05:30

tests

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

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

translations

[Translation] Updated Translations (#13570)

2018-04-12 13:36:55 +05:30

utilities

resolved merge conflicts

2018-04-24 11:16:13 +05:30

__init__.py

bumped to version 10.1.27

2018-04-25 13:16:48 +06:00

exceptions.py

…

hooks.py

Fixed merge conflict

2018-04-04 11:40:16 +05:30

modules.txt

Hotels (#11907)

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

patches.txt

[fix] resolved merge conflicts

2018-04-25 11:32:54 +05:30