Shreya Shah
db332f2c08
employee_details table added
2017-12-04 16:49:44 +05:30
Shreya
9956f15c80
added py test
2017-12-04 16:49:44 +05:30
Shreya
b5dff03453
added changes from process payroll
2017-12-04 16:49:44 +05:30
Shreya
d1defa5fc7
set salary components
2017-12-04 16:49:44 +05:30
Shreya
d73dd056d6
test case
2017-12-04 16:49:44 +05:30
Shreya
7b2870431e
new doctype payroll_entry
2017-12-04 16:49:44 +05:30
Zarrar
5e470f757f
[Fix] Filter on child table not working in Calendar ( #11824 )
...
* use the new get_events method
* using the common get_events method for calendar_view
* using add_fetch to fill customer_name
2017-12-04 11:22:25 +05:30
rohitwaghchaure
e34ef60e3e
[fix] Asset test cases and added make_sales_invoice ( #11800 )
...
* [fix] Asset test cases and added make_sales_invoice
* vehicle trip test cases
2017-11-30 15:59:40 +05:30
Zarrar
95ee7654a1
Employee tree ( #11667 )
...
* nested set implemented
* treeview for employee
* patch added to assign lft rgt, update nsm_model on trash
* call on_trash method of super class
2017-11-29 18:44:02 +05:30
Nabin Hait
ad2a3e4f38
Cleanup and fixes on delivery trip
2017-11-29 15:53:01 +05:30
Nabin Hait
46e285efe9
Merge branch 'add_delivery' of https://github.com/creamdory/erpnext into creamdory-add_delivery
2017-11-29 14:15:16 +05:30
Doridel Cahanap
de82fe9e8f
[minor] Set Rename for Training Program ( #11740 )
2017-11-28 11:26:23 +05:30
creamdory
fd1503c6a5
[New Feature] Delivery
2017-11-20 10:28:49 +08:00
Nabin Hait
1c4653ed97
Merge branch 'develop' into payment-terms
2017-11-17 12:41:56 +05:30
Zarrar
24b8aa2e80
set field dependent on link field fix ( #11580 )
2017-11-15 14:27:00 +05:30
Nabin Hait
6fd163bc55
Merge branch 'master' into develop
2017-11-15 14:08:17 +05:30
rohitwaghchaure
43edd5d03c
Employee loan fixes ( #11495 )
...
* Employee loan fixes
* Update update_employee_loan_details.py
2017-11-14 17:59:20 +05:30
tunde
ffa659fd2c
Merge branch 'develop' into payment-terms
2017-11-14 09:59:45 +01:00
Rushabh Mehta
d8bc8de6ca
[minor] remove unnecessary description in upload attendance, fixes #10603
2017-11-14 12:52:53 +05:30
Prateeksha Singh
17b7209032
remove erroneous column breaks ( #11522 )
2017-11-10 18:54:03 +05:30
Prateeksha Singh
731b66b788
remove erroneous column breaks ( #11523 )
2017-11-10 18:53:52 +05:30
rohitwaghchaure
cc97ec9202
[hotfix] Salary slip, leave considered in amount calculation even if depends on lwp is disabled in salary slip ( #11507 )
2017-11-10 15:06:58 +05:30
Saurabh
62fd4007b0
Merge branch 'master' into staging
2017-11-02 12:14:42 +05:30
tunde
31287b00a6
call get_employee_loan_application only when appropriate
2017-10-31 18:10:17 +01:00
tunde
14e97ce0c8
Merge branch 'develop' into payment-terms
2017-10-26 13:35:42 +01:00
Doridel Cahanap
49a7bde6e2
[minor] Label for Training Event in Training Program Dashboard ( #11280 )
2017-10-25 12:15:17 +05:30
Manas Solanki
a5eee4629f
Fix UI tests ( #11309 )
...
* decrease the timeout
* delete the duplicate test
2017-10-25 11:42:22 +05:30
tunde
c8d2361b81
Merge branch 'develop' into payment-terms
2017-10-24 12:25:29 +01:00
Doridel Cahanap
b06f155ceb
[minor] Set Quick Entry to False in Training Event ( #11279 )
2017-10-23 11:35:12 +05:30
Doridel Cahanap
5a4d5bfaf2
Add Training Program DocType, Script, Path and Doc ( #11181 )
...
* Add Training Program Doctype, Script, Config and documentation
* Add Training Program to Training Event
* [Test Case] Training Event in a Training Program
2017-10-20 11:31:15 +05:30
Nabin Hait
b4f5f14438
Timeout increased for setting __newname ( #11252 )
...
* Timeout increased for setting __newname
* UI test fixes
* fixed ui test for PO
* ui tests
* ui tests
* ui tests
* ui tests
* ui tests
2017-10-20 11:26:17 +05:30
tunde
09ce68ec19
Merge branch 'develop' into payment-terms
2017-10-19 17:47:31 +01:00
Helkyd
7ec7a45f05
Salary Detail Abbr ( #11165 )
...
When processing via Process Salary Abbr is not filled unless if Hourly pay ... this is required for later check what Component is or was added for Employee
2017-10-18 11:16:24 +05:30
KanchanChauhan
44734049f5
[Minor] Populate Expense Claim Description from Expense Claim Type ( #11156 )
2017-10-17 17:23:26 +05:30
Rushabh Mehta
bc4e2cd9c1
[added] hospitality domain ( #11020 )
...
* [added] hospitality domain
* [tests] wip
* [tests] for restaurant
* [fix] tests for new naming
* [docs] added restaurant docs
* [docs] added restaurant docs
2017-10-17 12:30:34 +05:30
Prateeksha Singh
bfb108d722
Replace c3 ( #11112 )
...
* [charts] replace in asset.js
* replace in reports
2017-10-17 12:03:02 +05:30
Saurabh
9893a2d608
Merge branch 'master' into develop
2017-10-10 11:22:39 +05:30
Saurabh
f347e23556
[fix] upload attendacne with with no_socketio param
2017-10-09 16:13:21 +05:30
tunde
e27f5dee1f
Merge branch 'develop' into payment-terms
2017-10-09 10:11:05 +01:00
Doridel Cahanap
5ba39f3f83
Add has_certificate and level fields in Training Event ( #11093 )
2017-10-09 12:45:28 +05:30
tunde
1db7faa862
Merge branch 'develop' into payment-terms
2017-10-06 09:37:10 +01:00
Doridel Cahanap
5cb6c38a34
Add Calendar in Training Event Doctype ( #11090 )
2017-10-06 11:50:05 +05:30
tunde
d82677f1e6
Merge branch 'develop' into payment-terms
2017-10-06 02:23:45 +01:00
Stavros Anastasiadis
455c3ebb27
Add as optional field link Company ( #11068 )
2017-10-05 18:45:37 +05:30
Utkarsh Goswami
975d28307a
Payroll feature ( #10900 )
2017-10-05 15:59:51 +05:30
Stavros Anastasiadis
ea390effa5
Add multirows in Attendees selection ( #11067 )
2017-10-05 15:31:25 +05:30
Nabin Hait
34ad2e6a60
Use format_currency only if fieldtype is currency
2017-10-05 15:28:43 +05:30
Nabin Hait
f8ad0cbe70
Merge branch 'develop' of https://github.com/Helkyd/erpnext-1 into Helkyd-develop
2017-10-05 15:02:50 +05:30
Doridel Cahanap
25db832be1
[minor] Add "Attendance" in grid view for Training Event Employee ( #11063 )
2017-10-05 14:20:43 +05:30
Nabin Hait
fc712aea32
Merge branch 'master' into develop
2017-10-04 18:05:20 +05:30