Jamsheer
|
3abae9c1ba
|
Employee Benefit Application - whitlist method get_max_benefits
|
2018-05-16 19:50:30 +05:30 |
|
Jamsheer
|
3e64297a3d
|
Employee Benefit Application - validate maximun benefit
|
2018-05-16 19:50:30 +05:30 |
|
Jamsheer
|
3cd0ad4c98
|
Codacy fixes
|
2018-05-16 19:50:30 +05:30 |
|
Jamsheer
|
c9287b5b88
|
Manage grouping of salary component for flexible benefit
|
2018-05-16 19:50:30 +05:30 |
|
Jamsheer
|
6410022cab
|
minor fixes
|
2018-05-16 19:49:39 +05:30 |
|
Jamsheer
|
c678d037e7
|
Salary slip - throw if no default flexi component
|
2018-05-16 19:49:39 +05:30 |
|
Jamsheer
|
5f6e274505
|
Salary slip - default flexi component
|
2018-05-16 19:49:39 +05:30 |
|
Jamsheer
|
43740a6511
|
Employee Benefit Application - employee benefit in salary slip
|
2018-05-16 19:49:39 +05:30 |
|
Jamsheer
|
0bc665c0a5
|
Salary Copmonent - Default flexible componnent
|
2018-05-16 19:49:39 +05:30 |
|
Jamsheer
|
15613e46ad
|
Salary Copmonent - Defualt flexible componnent
|
2018-05-16 19:48:47 +05:30 |
|
Jamsheer
|
d63c39a514
|
Payroll Period - get payroll period days
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
d66fb842c1
|
Employee Benefit Application - validate max benefit for employee
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
2d6901d5dc
|
Employee Benefit Application - validate max benefit amount for component
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
9cb2fc2766
|
Employee Benefit Application - calcluate benefit amount
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
d48998bae1
|
Employee Benefit Application - Calculate benefit amounts
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
779f8ebbb3
|
Employee Benefit Application - get max benefit
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
41616de9cc
|
Employee Benefit Application - validate duplicate
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
9cd292b187
|
Employee Benefit Application - filter updated
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
4d93d339f7
|
Employee benefit - filters fro earning component
|
2018-05-16 19:47:18 +05:30 |
|
Ranjith
|
29e0ed3da1
|
Exemption Declaration - field total_amount
|
2018-05-16 19:10:35 +05:30 |
|
Manas Solanki
|
df0ffab16c
|
Merge pull request #14093 from manassolanki/poc-fixes-1
[ui] more fields in the list view of assets
|
2018-05-16 18:25:37 +05:30 |
|
Manas Solanki
|
f3f1ba37b9
|
[ui] more fields in the list view of assets
|
2018-05-16 18:24:35 +05:30 |
|
rohitwaghchaure
|
4ea97c84ac
|
Merge pull request #14092 from rohitwaghchaure/enterprise_develop_asset_fixes_for_perpetual
[Fix] Asset gl entry not creating for non perpetual
|
2018-05-16 18:21:20 +05:30 |
|
Rohit Waghchaure
|
421697250b
|
[Fix] Asset gl entry not creating for non perpetual
|
2018-05-16 18:20:52 +05:30 |
|
Manas Solanki
|
2684593af0
|
Merge pull request #14091 from manassolanki/poc-fixes-1
Added the travel request on the config page
|
2018-05-16 18:10:57 +05:30 |
|
Manas Solanki
|
5b34c00ba6
|
Added the travel request on the config page
|
2018-05-16 18:09:43 +05:30 |
|
Manas Solanki
|
fa57cdd86d
|
Merge pull request #14090 from manassolanki/poc-fixes
create item default on making of invoice
|
2018-05-16 17:46:53 +05:30 |
|
Manas Solanki
|
5b93562ce3
|
create default on making of invoice
|
2018-05-16 17:44:51 +05:30 |
|
rohitwaghchaure
|
19a2260ce7
|
Merge pull request #14089 from shreyashah115/fixes
[Fix] General Ledger report filters error
|
2018-05-16 17:41:19 +05:30 |
|
Shreya
|
63d14cfac8
|
Instead of throwing error, just return
|
2018-05-16 17:30:58 +05:30 |
|
Shreya
|
df9516e906
|
Add Finance Book to route options
|
2018-05-16 17:30:35 +05:30 |
|
Manas Solanki
|
efae732370
|
Merge pull request #14088 from manassolanki/item-fixes
more fixes for the item defaults
|
2018-05-16 17:16:25 +05:30 |
|
Manas Solanki
|
e3bb1d0e3b
|
more fixes for the item defaults
|
2018-05-16 17:14:59 +05:30 |
|
rohitwaghchaure
|
64076730a1
|
Merge pull request #14087 from manassolanki/item-fixes
return defaults according to the company
|
2018-05-16 17:02:32 +05:30 |
|
Manas Solanki
|
38667ab8da
|
return defaults according to the company
|
2018-05-16 17:00:05 +05:30 |
|
rohitwaghchaure
|
adc5b128b6
|
Merge pull request #14086 from rohitwaghchaure/multiple_fixes
Multiple fixes
|
2018-05-16 16:42:25 +05:30 |
|
Rohit Waghchaure
|
b233e9d643
|
[Fix] Multiple fixes
|
2018-05-16 16:41:34 +05:30 |
|
Manas Solanki
|
028e2ad246
|
Merge pull request #14083 from frappe/codingCoffee-patch-3
spaces to tabs
|
2018-05-16 16:25:25 +05:30 |
|
rohitwaghchaure
|
de796266f2
|
Merge pull request #14084 from shreyashah115/fixes
[minor] Fix error
|
2018-05-16 16:21:14 +05:30 |
|
rohitwaghchaure
|
9c0a87e804
|
Merge pull request #14082 from manassolanki/item-fixes
[fixes] fix in the item defaults
|
2018-05-16 16:19:39 +05:30 |
|
Manas Solanki
|
e3910fb2a6
|
[fixes] fix in the item defaults
|
2018-05-16 16:16:34 +05:30 |
|
Shreya
|
fda15702bc
|
Fix error
|
2018-05-16 16:14:34 +05:30 |
|
Ameya Shenoy
|
6e92958578
|
spaces to tabs
|
2018-05-16 16:11:20 +05:30 |
|
rohitwaghchaure
|
a7559be5b2
|
Merge pull request #14080 from rohitwaghchaure/po_pi_issue
[Fix] 'PurchaseInvoiceItem' object has no attribute 'company'
|
2018-05-16 15:42:53 +05:30 |
|
Rohit Waghchaure
|
23942701f1
|
[Fix] 'PurchaseInvoiceItem' object has no attribute 'company'
|
2018-05-16 15:41:00 +05:30 |
|
Manas Solanki
|
8e184569a1
|
Update item.json
|
2018-05-16 15:11:52 +05:30 |
|
rohitwaghchaure
|
9122f19e69
|
Merge pull request #14079 from saurabh6790/TDS_sprint
[fix] calculate withholding only on invoice
|
2018-05-16 15:01:46 +05:30 |
|
Saurabh
|
3c204122cd
|
[fix] calculate withholding only on invoice
|
2018-05-16 15:00:19 +05:30 |
|
Manas Solanki
|
b81ece9ddf
|
Merge pull request #14076 from chdecultot/pricing_rule
Missing parentheses in price list rate determination
|
2018-05-16 14:55:32 +05:30 |
|
Manas Solanki
|
4534df36a9
|
Merge pull request #14078 from manassolanki/pos-fix
[enterprise] minor fixes
|
2018-05-16 14:53:21 +05:30 |
|