brotherton-erpnext/erpnext
Nabin Hait ba70e7e8bc
Payroll based on attendance (#21258)
* feat: Payroll based on attendance and leave

* test: salary slip based 0n attendance

* feat: Payroll based on attendance

* fix: Codacy issues

Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
2020-04-26 20:17:48 +05:30
..
accounts feat: Allow tax withholding category selection at invoice level (#20870) 2020-04-26 20:08:52 +05:30
agriculture feat: updated desk pages (#21138) 2020-04-10 18:52:05 +05:30
assets fix: asset maintenance fixes (#21277) 2020-04-22 11:48:19 +05:30
buying fix [ux]: Purchase Order Form Cleanup (#20932) 2020-04-26 20:07:22 +05:30
change_log log: Change log for v12.2.0 2019-11-25 15:08:47 +05:30
commands
communication feat: changes for desk pages (#21027) 2020-03-31 10:30:20 +05:30
config feat(Healthcare): Rehabilitation Module (#21216) 2020-04-22 13:07:12 +05:30
controllers feat: Payment allocation based on payment terms (#20945) 2020-04-23 16:07:36 +05:30
crm Merge branch 'develop' into social-media-integration-feat 2020-04-25 17:37:24 +05:30
demo fix: remove make_purchase_invoice from demo script 2020-03-11 16:20:07 +05:30
domains
education feat: updated desk pages (#21138) 2020-04-10 18:52:05 +05:30
erpnext_integrations fix: Valid warehouse in woocommerce syncing and other small fixes (#21407) 2020-04-25 14:52:05 +05:30
healthcare feat(Healthcare): Rehabilitation Module (#21216) 2020-04-22 13:07:12 +05:30
hotels fix: conflicts 2020-02-27 13:16:53 +05:30
hr Payroll based on attendance (#21258) 2020-04-26 20:17:48 +05:30
hub
hub_node Merge branch 'develop' into publish-item 2019-12-25 22:10:33 +05:30
loan_management fix: Loan Disbursement against account 2020-04-25 13:15:45 +05:30
maintenance fix: conflicts 2020-02-27 13:16:53 +05:30
manufacturing fix: Valid warehouse in woocommerce syncing and other small fixes (#21407) 2020-04-25 14:52:05 +05:30
non_profit fix: linting fixes 2020-04-20 18:25:51 +05:30
patches Payroll based on attendance (#21258) 2020-04-26 20:17:48 +05:30
portal fix: review changes 2019-12-16 15:04:17 +05:30
projects Update project.json (#21274) 2020-04-19 20:19:10 +05:30
public fix: remove debugger 2020-04-24 16:41:48 +05:30
quality_management feat: updated desk pages (#21138) 2020-04-10 18:52:05 +05:30
regional feat: Allow tax withholding category selection at invoice level (#20870) 2020-04-26 20:08:52 +05:30
restaurant
selling Merge branch 'develop' into social-media-integration-feat 2020-04-25 17:37:24 +05:30
setup feat: updated desk pages (#21138) 2020-04-10 18:52:05 +05:30
shopping_cart fix: merge conflicts 2020-04-07 16:42:50 +05:30
startup style: Fix Codacy 2019-09-30 13:09:12 +05:30
stock Merge pull request #21389 from marination/stock-entry-qty 2020-04-26 17:59:45 +05:30
support fix: filters as dictionary 2020-04-19 12:47:48 +05:30
templates Merge pull request #21252 from nextchamp-saqib/tax-breakup-for-cn 2020-04-14 12:41:25 +05:30
tests fix: delete contact email and phone along with contact 2020-03-26 13:15:31 +05:30
translations fix: Merge branch 'develop' into healthcare_refactor 2020-03-25 02:08:42 +05:30
utilities fix: Re-order Item Error Email format (#21342) 2020-04-21 12:52:29 +05:30
www fix: merge conflicts 2020-04-07 16:42:50 +05:30
__init__.py fix: develop version as 12.0.0-dev 2020-03-20 15:38:52 +05:30
exceptions.py fix: Travis 2019-10-20 17:36:36 +05:30
hooks.py Merge branch 'develop' into social-media-integration-feat 2020-04-25 17:37:24 +05:30
modules.txt fix: conflicts 2020-02-27 13:16:53 +05:30
patches.txt Payroll based on attendance (#21258) 2020-04-26 20:17:48 +05:30