brotherton-erpnext/erpnext
rohitwaghchaure 8df0556af5
Merge pull request #12587 from shreyashah115/leave-workflow
Refactor Leave Application
2018-01-24 15:04:17 +05:30
..
accounts resolved merge conflicts 2018-01-24 11:24:10 +05:30
agriculture Update agriculture_analysis_criteria.json (#12478) 2018-01-15 12:33:03 +05:30
assets GL Entry on asset sale (#12514) 2018-01-17 14:39:05 +05:30
buying Merge branch 'master' into develop 2018-01-19 13:29:57 +05:30
change_log Version 10 change log 2017-12-25 12:25:52 +05:30
commands
config Add desk icons for healthcare - fixes 11838 (#12518) 2018-01-17 16:11:09 +05:30
controllers resolved merge conflicts 2018-01-24 11:24:10 +05:30
crm [fix] primary button color for make 2018-01-23 16:08:52 +05:30
demo modified leave application tests 2018-01-22 12:26:41 +05:30
docs Merge pull request #12547 from joshreeder/patch-1 2018-01-24 07:57:15 +05:30
domains Set the guardian role automatically. (#12136) 2017-12-22 10:50:10 +05:30
education resolved merge conflicts 2018-01-12 16:58:32 +05:30
erpnext_integrations Add Github Connector (#11259) 2017-11-13 19:19:13 +05:30
healthcare Patient Appointment - Check appointment day is holiday or physician on leave (#12556) 2018-01-23 17:23:27 +05:30
hr Merge pull request #12587 from shreyashah115/leave-workflow 2018-01-24 15:04:17 +05:30
hub
hub_node Employee advance (#11875) 2017-12-14 13:25:57 +05:30
maintenance Added maintenance to Asset and enhanced maintenance for Asset Maintenance 2017-11-28 15:14:56 +05:30
manufacturing Merge branch 'master' into develop 2018-01-19 13:29:57 +05:30
non_profit resolved merge conflicts 2018-01-24 11:24:10 +05:30
patches Merge pull request #12587 from shreyashah115/leave-workflow 2018-01-24 15:04:17 +05:30
portal Set the guardian role automatically. (#12136) 2017-12-22 10:50:10 +05:30
projects [Minor] Fix adding child to root task issue (#12121) 2017-12-22 11:00:19 +05:30
public resolved merge conflicts 2018-01-24 11:24:10 +05:30
regional [fix] ficher_des_ecritures patch 2018-01-24 14:39:04 +05:30
restaurant Fix travis (#11882) 2017-12-08 14:57:38 +05:30
selling Used cint instead of int 2018-01-23 18:28:05 +05:30
setup resolved merge conflicts 2018-01-24 11:24:10 +05:30
shopping_cart [fix] Add to cart issue fixed (#12474) 2018-01-15 14:01:05 +05:30
startup [hotfix] User not able to edit exchange rate even if Allow Stale Exchange Rates is disabled in the accounts settings (#11409) 2017-11-02 18:12:14 +05:30
stock resolved merge conflicts 2018-01-24 11:24:10 +05:30
support [fix] primary button color for make 2018-01-23 16:08:52 +05:30
templates Update total.html (#12511) 2018-01-17 14:41:38 +05:30
tests [Minor] Fix adding child to root task issue (#12121) 2017-12-22 11:00:19 +05:30
translations [Translation] Updated Translations (#12613) 2018-01-23 14:35:52 +05:30
utilities Merge branch 'master' into develop 2018-01-19 15:49:29 +05:30
__init__.py bumped to version 10.0.14 2018-01-24 11:52:53 +06:00
exceptions.py
hooks.py GSTR1 for B2B (#12296) 2018-01-10 17:48:03 +05:30
modules.txt [Agriculture Domain] (#11663) 2017-12-06 18:36:27 +05:30
patches.txt Merge pull request #12587 from shreyashah115/leave-workflow 2018-01-24 15:04:17 +05:30