nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-17 22:05:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
dc5f7a0c09fa3375a4ceb8d5a0d74dbac3a4ca41
erpnext/erpnext
History
Frappe PR Bot dc5f7a0c09 fix(Payroll): incorrect component amount calculation if dependent on another payment days based component (#27454) 
* fix(Payroll): incorrect component amount calculation if dependent on another payment days based component (#27349)

* fix(Payroll): incorrect component amount calculation if dependent on another payment days based component

* fix: set component amount precision at the end

* fix: consider default amount during taxt calculations

* test: component amount dependent on another payment days based component

* fix: test

(cherry picked from commit bab644a249)

# Conflicts:
#	erpnext/payroll/doctype/salary_slip/test_salary_slip.py

* fix: conflicts in test file

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-09-13 15:14:28 +05:30
..
accounts
chore: whitespace/imports
2021-09-13 10:31:00 +05:30
agriculture
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
assets
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
buying
feat: (get_items_from) filter material request item in purchase order (#27452)
2021-09-13 14:01:39 +05:30
change_log
chore: change log for v13.10.0
2021-09-01 22:26:41 +05:30
commands
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
communication
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
config
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
controllers
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
crm
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
demo
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
domains
chore: whitespace cleanup from codebase
2021-08-19 14:33:03 +05:30
e_commerce
fix: Website item patch fixes
2021-09-09 09:47:18 +05:30
education
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
erpnext_integrations
chore: whitespace (#27416)
2021-09-09 19:16:21 +05:30
healthcare
fix(healthcare): Added item price to default price list (#27353)
2021-09-06 13:27:28 +05:30
hotels
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
hr
fix: employee remider settings (#27365) (#27366)
2021-09-07 00:20:38 +05:30
hub
…
hub_node
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
loan_management
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
maintenance
refactor: .doc missing and empty row on new doc (#27408) (#27414)
2021-09-09 19:13:06 +05:30
manufacturing
fix: job card overlap unknown column jc.employee (#27403) (#27405)
2021-09-09 12:45:25 +05:30
non_profit
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
patches
chore: whitespace/imports
2021-09-13 10:31:00 +05:30
payroll
fix(Payroll): incorrect component amount calculation if dependent on another payment days based component (#27454)
2021-09-13 15:14:28 +05:30
portal
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
projects
fix: sider issues
2021-09-10 13:00:30 +05:30
public
feat: (get_items_from) filter material request item in purchase order (#27452)
2021-09-13 14:01:39 +05:30
quality_management
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
regional
chore: whitespace/imports
2021-09-13 10:31:00 +05:30
restaurant
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
selling
Merge branch 'version-13-hotfix' into merge-hotfix-to-pre-release-v13-11-0
2021-09-10 12:41:54 +05:30
setup
Merge branch 'version-13-hotfix' into merge-hotfix-to-pre-release-v13-11-0
2021-09-10 12:41:54 +05:30
shopping_cart
chore: remove deprecated and empty QUnit tests (#27179) (#27181)
2021-08-26 21:08:08 +05:30
startup
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
stock
feat: (get_items_from) filter material request item in purchase order (#27452)
2021-09-13 14:01:39 +05:30
support
fix(SLA): select options for 'Pause SLA On' (#27376)
2021-09-07 18:45:26 +05:30
telephony
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
templates
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
tests
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
translations
chore: Update translations (#23856)
2020-11-09 18:37:28 +05:30
utilities
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
www
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
__init__.py
Merge branch 'version-13-hotfix' into merge-hotfix-to-pre-release-v13-11-0
2021-09-10 12:41:54 +05:30
.stylelintrc
chore: whitespace cleanup from codebase
2021-08-19 14:33:03 +05:30
exceptions.py
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
hooks.py
chore: Cleanup imports (#27320)
2021-09-03 18:57:43 +05:30
modules.txt
chore: Removed Shopping Cart Module
2021-03-08 10:28:02 +05:30
patches.txt
Merge branch 'version-13-hotfix' into backport/version-13-hotfix/27143
2021-09-08 17:20:20 +05:30