Commit Graph

6 Commits

Author SHA1 Message Date
Nabin Hait
abd0325acd Fixed merge conflict 2018-05-05 12:19:14 +05:30
Suraj Shetty
00cced12a0 Success Action (#13666)
* success action config for  sales invoice

* remove "Notification Control" doctype and its usage

* add default success action after_install or while migration (patch)

* rename for_doctype to ref_doctype

* case change

* minor fix

* Remove unnecessary code

* Replace message with translatable message

* Fix 'cannot import error'
2018-05-03 19:06:32 +05:30
Nabin Hait
ed376cacc8
Set Qty in transactions based on serial no via Stock Settings (#13897) 2018-05-03 16:24:52 +05:30
Shreya Shah
44e719d64c [Enhancement] Leave Application and Expense Claim (#13645)
* child table employee expense approver

* set query in department

* mandatory approver check in hr settings

* triggers on leave and expense approver

* fetch all parent approvers from department hierarchy

* fixes

* patch to move employee approvers from employee to department

* removed hard coding of roles

* modify approvers list query

* commonified functions

* patch

* renamed standard reply occurrences

* removed leave approvers table from Employee master

* email templates for leave application notification

* set default email templates for leave in hr settings

* notify by email template

* approval status in expense claim

* render template in patch

* removed unused code

* Single child table department approver

* read instead of render template
2018-04-19 20:58:52 -08:00
Rohit Waghchaure
395d61b998 [Fix] Travis 2018-04-02 15:11:47 +05:30
Prateeksha Singh
8b0b56dda4 [Setup Wizard] Use setup stages (#12000)
* setup working with packages imports for operations

* setup stages

* use setup_stages hook

* remove commit from app setup
2017-12-21 11:55:58 +05:30