Jamsheer
f1d10bf286
Salary Component - remove flexi_default
2018-05-25 12:52:23 +05:30
Jamsheer
620c3a872c
Employee Benefit Claim - non pro-rata claim validation updated
2018-05-25 12:52:23 +05:30
Jamsheer
dc698a891d
options to fetch from migration
2018-05-25 12:52:23 +05:30
Jamsheer
8eec40cb8a
Employee Benefits in Salary Slip - Application and Claim
2018-05-25 12:46:31 +05:30
Jamsheer
16e924333e
get payroll period days - fix
2018-05-25 12:46:31 +05:30
Jamsheer
47d865baa0
Calculate remaining benefit amount in Employee Benefit Application
2018-05-25 12:46:31 +05:30
Jamsheer
8a953ba516
Validate remaining benefit amount in Employee Benefit Application
2018-05-25 12:46:31 +05:30
Jamsheer
772f257ff3
Employee Benefit Claim - date default to Today
2018-05-25 12:46:31 +05:30
Jamsheer
eacaad3aec
Max benefit amount in Employee Benefit Application Detail
2018-05-25 12:42:21 +05:30
Jamsheer
c1ae88ba02
Employee Benefit Calim - earning component filter updated
2018-05-25 12:42:20 +05:30
Jamsheer
c5629efe0e
Employee Benefit Application - refactor validation
2018-05-25 12:42:20 +05:30
Jamsheer
9d5d328a4f
Salary Structure - validate flexi with max benefit
2018-05-25 12:42:20 +05:30
Jamsheer
65a5e47e68
Payroll Period - validate dates and overlap
2018-05-25 12:37:36 +05:30
Jamsheer
cf414cc499
Payroll Period - fields refactor
2018-05-25 12:37:36 +05:30
Jamsheer
2ee211ad21
Salary Structure - validate max benefits with flexi
2018-05-25 12:37:36 +05:30
Jamsheer
ce7310255e
Salary Structure - filter for earnings
2018-05-25 12:37:36 +05:30
Jamsheer
43e191289c
Employee Benefit Application - earning component filter by salary structure flexi component
2018-05-25 12:37:36 +05:30
Jamsheer
77a91f0d01
Salary Component - account mandatory for separate payment entry
2018-05-25 12:37:36 +05:30
Jamsheer
1248f6a752
Codacy fix
2018-05-25 12:37:36 +05:30
Jamsheer
0493c22f3c
Additional Salary Component - filter updated - salary_component
2018-05-25 12:37:35 +05:30
Jamsheer
f647aa15af
Salary Component - fields - refactor fields behaviour
2018-05-25 12:37:35 +05:30
Jamsheer
334bd189a7
Employee Benefit Application - filter updated - earning component
2018-05-25 12:37:35 +05:30
Jamsheer
da24722beb
Employee Benefit Claim - filter for earning component
2018-05-25 12:37:35 +05:30
Jamsheer
ce88bdf005
Employee Benefit Claim - Validation Updated - Code refactor
2018-05-25 12:37:35 +05:30
Nabin Hait
f87ec61043
Test case fixes for item defaults
2018-05-24 18:19:21 +05:30
Ranjith Kurungadam
27cf190269
healthcare fix - str encode to utf-8 ( #14213 )
2018-05-24 17:15:22 +05:30
Nabin Hait
b903fc4e71
Item defaults query fixes
2018-05-24 17:07:51 +05:30
Prateeksha Singh
05283b8af0
[fix] distribution page embed
2018-05-24 16:17:22 +05:30
Zarrar
ea064d4c5c
module import fix in patch ( #14203 )
2018-05-24 15:54:48 +05:30
Achilles Rasquinha
2ec5b5ed8e
bench init with preferred Python EXEC for CI ( #13336 )
...
* bench_init.sh added python executable flag for environment setup
* Added future python build matrix
* udpate build matrix
* Update .travis.yml
* Update .travis.yml
2018-05-24 15:16:12 +05:30
Ameya Shenoy
95e60927b4
Merge branch 'master' into develop
2018-05-24 08:45:14 +00:00
Ameya Shenoy
7ad556cd4c
Merge branch 'hotfix'
2018-05-24 08:45:12 +00:00
Ameya Shenoy
475729cefe
bumped to version 10.1.35
2018-05-24 08:45:12 +00:00
neckos
7663bb91c5
return list(filter()) not filter() ( #14191 )
...
filter constructs an iterator that is iterable only once
2018-05-23 19:45:34 +05:30
neckos
225af4a4cb
unicode error in python3 ( #14192 )
2018-05-23 19:43:53 +05:30
Manas Solanki
f7713ebfa7
[optimize] introduce two filter in the report in order to handle large item master data ( #14193 )
2018-05-23 19:43:04 +05:30
Nabin Hait
5f861756a2
Item Default fixes
2018-05-23 19:37:06 +05:30
Nabin Hait
d5cb4c10a1
Set parent department if missing and not root itself
2018-05-23 18:36:18 +05:30
Rushabh Mehta
315dbd2ed1
[minor] chart_of_accounts.py for python3
2018-05-23 16:14:35 +05:30
Rushabh Mehta
f7414519bb
[fix] set default supplier group in test
2018-05-23 16:14:35 +05:30
Rushabh Mehta
8788688431
[fix] inconsistent indentation
2018-05-23 16:14:35 +05:30
Nabin Hait
46600406b8
Update rename_field_max_days_allowed.py
2018-05-23 13:12:24 +05:30
Achilles Rasquinha
efb731941d
ran 2to3, evaluation ( #13499 )
...
* ran 2to3, evaluation
* Update update_gstin.py
* Update accounts_receivable_summary.py
2018-05-23 11:31:24 +05:30
Zarrar
c141eb00ee
[Enhance] Department added wherever applicable ( #14121 )
...
* set All Department as default parent_department
* add department field in employee_transfer
* copied data from options to fetch_from
* add department field wherever employee's link field present
* empty options field where fetch_from is added
2018-05-23 11:11:36 +05:30
Deepak kumar
e4c2ef03e1
Link Share Transfer to Account ( #14127 )
...
* Link Share Transfer to Account
* minor changes
* minoor changes
2018-05-23 10:50:22 +05:30
OSS Technolab
4fb4ca6b10
Project Budget does not filter per Project ( #14179 )
...
* Project Budget does not filter per Project
Project Budget does not filter per Project and always return actual expense amount of all entries tagged to a project.
* Update budget.py
2018-05-23 10:47:53 +05:30
Prateeksha Singh
2f69254e56
[company][dashboard] implement heatmap with linked doctypes ( #14185 )
...
* [company][dashboard] implement heatmap with linked doctypes
* [company][dashboard] cache transaction history data, schedule query daily
2018-05-23 10:41:26 +05:30
Suraj Shetty
e03937fd6a
Send daily work summary alert to only enabled users ( #14175 )
...
* Send daily work summary alert to only enabled users
* Fix import
2018-05-23 10:32:55 +05:30
Faris Ansari
26eb513274
Rename occurences of max_days_allowed to max_continuous allowed ( #14180 )
2018-05-23 10:31:39 +05:30
Faris Ansari
83149644e3
Merge pull request #14160 from shreyashah115/patches-fixes-travis
...
Fix patches for Travis
2018-05-22 15:26:49 +05:30
