Rushabh Mehta
|
176b63b354
|
[fix] remove first row on mapping, fixes #5707
|
2016-07-14 17:43:48 +05:30 |
|
Rushabh Mehta
|
4beba3aff9
|
Merge pull request #5705 from KanchanChauhan/fixed-employee-holiday-attendance-report
Added Holiday List filter
|
2016-07-12 11:11:43 +05:30 |
|
Kanchan Chauhan
|
54860cd57d
|
Added Holiday List filter
|
2016-07-11 15:16:47 +05:30 |
|
Rushabh Mehta
|
391c0efcee
|
[fix] make grids editable
|
2016-07-11 13:01:58 +05:30 |
|
Nabin Hait
|
12e8277b6b
|
Merge pull request #5681 from nabinhait/sal_slip_print
Print formats for salary slip
|
2016-07-08 08:35:31 +05:30 |
|
Rohit Waghchaure
|
0d4a9c225f
|
[Salary Structure] Make salary_component field mandatory if salary_slip_based_on_timesheet is true
|
2016-07-07 17:04:54 +05:30 |
|
Rushabh Mehta
|
964ad0fcae
|
[cleanup] rename "links" to "dashboard"
|
2016-07-07 14:28:05 +05:30 |
|
Nabin Hait
|
027acde4f4
|
Print formats for salary slip
|
2016-07-07 13:17:21 +05:30 |
|
Rohit Waghchaure
|
e94d18b4cd
|
Rename Time Sheet doctype
|
2016-07-06 20:38:50 +05:30 |
|
Rohit Waghchaure
|
3188b56694
|
[Fixes] Time sheet fixes
|
2016-07-06 14:31:14 +05:30 |
|
Kanchan Chauhan
|
d963b76a4b
|
Salary component cleanup
|
2016-07-06 12:04:38 +05:30 |
|
Saurabh
|
c2934ba9da
|
[minor][fix] holiday list exception message fix
|
2016-07-04 13:06:29 +05:30 |
|
Nabin Hait
|
13093b4b68
|
Make payment entry aginst order, payment request and patch to rename advance table fields
|
2016-07-04 11:42:24 +05:30 |
|
Rushabh Mehta
|
b33df4afe8
|
[cleanup] link methods made common
|
2016-07-04 11:39:25 +05:30 |
|
Rushabh Mehta
|
8c2e79cf0d
|
[minor] fixes
|
2016-07-04 11:39:25 +05:30 |
|
Rohit Waghchaure
|
3fa0b51e5e
|
[Fixes] Time sheet fixes and changed timesheets to time_logs
|
2016-06-29 19:04:16 +05:30 |
|
Rohit Waghchaure
|
a62dcce46a
|
[Fix] make_for field removed
|
2016-06-29 01:42:52 +05:30 |
|
Rushabh Mehta
|
822209cb03
|
Merge pull request #5538 from rohitwaghchaure/time_sheet_wages
[Enhancement] Time log wages and multiple active salary structure
|
2016-06-27 17:13:48 +05:30 |
|
Rushabh Mehta
|
689130cf9b
|
[minor] fix holiday_list validation
|
2016-06-27 17:16:00 +05:30 |
|
Rohit Waghchaure
|
d6c986da8f
|
[Enhancement] Time log wages and multiple active salary structure
|
2016-06-27 16:46:39 +05:30 |
|
Kanchan Chauhan
|
68f5ae5cbf
|
Changes done
|
2016-06-26 14:10:24 +05:30 |
|
Kanchan Chauhan
|
4c0df04db0
|
Retirement Age option in HR Settings
|
2016-06-25 17:45:16 +05:30 |
|
Rushabh Mehta
|
a334062b03
|
[redesign] website routing system
|
2016-06-24 16:18:07 +05:30 |
|
Rushabh Mehta
|
8a065e0028
|
[rename] Bulk Email to Email Queue
|
2016-06-22 12:58:39 +05:30 |
|
Nabin Hait
|
2460ee897a
|
Merge pull request #5367 from KanchanChauhan/job_openings_public
[Minor Fix] Job Opening should not require login
|
2016-06-01 13:18:26 +05:30 |
|
Rushabh Mehta
|
535f3b0975
|
[minor] make task editable in project and add description to designation fixing #5361
|
2016-06-01 12:52:50 +05:30 |
|
Rushabh Mehta
|
aa60fd9037
|
[fix] new_doc to frappe.new_doc
|
2016-06-01 11:46:33 +05:30 |
|
Kanchan Chauhan
|
adad5fb11e
|
[Minor Fix] Job Opening should not require login
|
2016-05-18 16:33:29 +05:30 |
|
Anand Doshi
|
c2ade3d34f
|
Merge pull request #5298 from neilLasrado/sal-slip
Moved email salary slip to employee under HR Settings
|
2016-05-09 16:56:51 +05:30 |
|
Neil Trini Lasrado
|
b2b0b37cc1
|
Added reference_doctype and reference_name to link Bulk Email to Salary Slip
|
2016-05-09 13:24:31 +05:30 |
|
Nabin Hait
|
332d29f166
|
Merge branch 'master' into develop
|
2016-05-06 16:13:35 +05:30 |
|
Nabin Hait
|
09fec7a15e
|
Merge pull request #5313 from shreyasp/support-week-hotfix
[Hotfixes] Payment tool and Leave Allocation Tool
|
2016-05-05 16:44:40 +05:30 |
|
shreyas
|
55cbd52200
|
[Fix] Allocate leaves only to active employees
|
2016-05-05 15:16:39 +05:30 |
|
Valmik Jangla
|
a0b9c4cdeb
|
Fixed Leave Application issue
|
2016-05-05 01:20:47 -07:00 |
|
Neil Trini Lasrado
|
71e93d6691
|
Added test cased
|
2016-05-02 12:04:20 +05:30 |
|
Neil Trini Lasrado
|
b14af59d39
|
Moved send email checkbox from salary slip to a global setting under hr settings
|
2016-05-02 12:04:19 +05:30 |
|
Rushabh Mehta
|
be2ee18de4
|
[fixed] frappe.require is now async 💥
|
2016-04-29 17:22:42 +05:30 |
|
Rushabh Mehta
|
1aa1c8a9ef
|
[minor] remove hide_first in forms
|
2016-04-29 12:20:23 +05:30 |
|
Anand Doshi
|
79c536acb5
|
Merge branch 'master' into develop
|
2016-04-27 15:44:11 +05:30 |
|
Saurabh
|
9be40ee7c3
|
[fixes] raise exception while deleting fiscal year if fiscal year is set as default in Global Settings and while calculating get_month_details if year_start_date not found
|
2016-04-27 12:58:40 +05:30 |
|
Rushabh Mehta
|
c291ab64a6
|
Merge pull request #5197 from KanchanChauhan/UXChanges_ERPNext
[WIP] No not merge
|
2016-04-21 11:39:45 +05:30 |
|
Rushabh Mehta
|
02772442b6
|
[cleanup] added dashboard in project
|
2016-04-20 18:45:56 +05:30 |
|
Kanchan Chauhan
|
11638ba358
|
Changes 3
|
2016-04-20 16:24:25 +05:30 |
|
Kanchan Chauhan
|
704f248952
|
Changes 2
|
2016-04-20 16:24:24 +05:30 |
|
Rushabh Mehta
|
0525387328
|
[enhancement] added reserved_qty_for_production in bin and updated item dashboard
|
2016-04-18 19:27:46 +05:30 |
|
Nabin Hait
|
972c25f78d
|
Fixed conflict
|
2016-04-14 18:25:53 +05:30 |
|
Rushabh Mehta
|
15a7f215b9
|
[enhancement] heatmaps on item and notifications for item
|
2016-04-14 17:30:53 +05:30 |
|
Rushabh Mehta
|
0e2dd859b0
|
[cleanup] link dashboard for customer, supplier, item, employee and hide form by default
|
2016-04-13 17:22:09 +05:30 |
|
Neil Trini Lasrado
|
cb6430575b
|
Fixed validation message for disabled employee
|
2016-04-08 16:36:26 +05:30 |
|
Valmik Jangla
|
c33e96f860
|
Leave Allocation Fix
|
2016-04-07 12:02:31 +05:30 |
|
Rushabh Mehta
|
78b7a53635
|
[cleanup] set default bold, print_hide for prints
|
2016-04-06 15:29:45 +05:30 |
|
Anand Doshi
|
ca95384f05
|
[fix] Salary Slip: use accounts.utils.get_fiscal_year
|
2016-04-06 12:31:01 +05:30 |
|
Rushabh Mehta
|
d690094b12
|
[image] added default image field for employee, customer, item, contact, lead, supplier and using - instead of / as separator in BOM
|
2016-04-04 16:57:56 +05:30 |
|
Rushabh Mehta
|
cb144bfcd4
|
[cleanup] projects
|
2016-03-31 14:27:35 +05:30 |
|
Rushabh Mehta
|
c9850f9e04
|
Merge pull request #5077 from frappe/master
Master
|
2016-03-29 11:59:32 +05:30 |
|
Rushabh Mehta
|
3117b4b8d6
|
[fix] minor for quick-entry
|
2016-03-29 11:53:17 +05:30 |
|
Rushabh Mehta
|
1b5edcbbd8
|
[fix] holiday_list issues in maintenance schedule too
|
2016-03-25 11:22:15 +05:30 |
|
Rushabh Mehta
|
51135a1522
|
[fix] fix get holidays in leave application
|
2016-03-25 11:13:11 +05:30 |
|
Rushabh Mehta
|
e29192c197
|
[fix] default letter in salary slip comes from customized default or company and optimized boot for curreny
|
2016-03-22 14:52:25 +05:30 |
|
Saurabh
|
6a277e244c
|
[fixes] set todays date on employee attendance tool
|
2016-03-20 19:00:26 +05:30 |
|
rohitwaghchaure
|
277b7fa641
|
[Enhancement]Fetch default letter head of company on salary structure and salary slip
|
2016-03-18 16:33:18 +05:30 |
|
Valmik Jangla
|
15343be386
|
Commonified functions for retrieving Leave Approvers
|
2016-03-17 11:47:30 +05:30 |
|
Valmik Jangla
|
33cc081c3b
|
Improved Leave Application / Approver feature
|
2016-03-17 11:47:30 +05:30 |
|
Nabin Hait
|
89301863e5
|
minot fixes
|
2016-03-15 15:20:49 +05:30 |
|
Anand Doshi
|
4284fcf2a6
|
[fix] additional fixes for removal of Fiscal Year form Holiday List
|
2016-03-11 17:16:30 +05:30 |
|
Valmik Jangla
|
e2b8af16ed
|
Fixed Salary Slip to work with new Holiday List
|
2016-03-11 14:58:55 +05:30 |
|
Valmik Jangla
|
ba54a43e32
|
Fixed Maintenance Schedule to work wit new Holiday List
Improved code in Holiday List for speed
|
2016-03-11 14:58:55 +05:30 |
|
Valmik Jangla
|
3427c939bd
|
Removed unused code
|
2016-03-11 14:58:55 +05:30 |
|
Valmik Jangla
|
c666030f34
|
Get Weekly Off dates now gets dates dynamically
Fixed Holiday List test records
|
2016-03-11 14:58:55 +05:30 |
|
Valmik Jangla
|
3085186182
|
Removed Fiscal Year from Holiday List and Calendar
|
2016-03-11 14:58:55 +05:30 |
|
Anand Doshi
|
c75c1d7e3e
|
[fix] additional fixes after deprecating Fiscal Year
|
2016-03-11 14:56:19 +05:30 |
|
Valmik Jangla
|
d9cc14ddd5
|
Removed from Leave Block List and Monthly Attendance List
|
2016-03-11 13:07:49 +05:30 |
|
Valmik Jangla
|
13bb2ba779
|
Removed fiscal year related things from, Recurrent Document, Leave Application, Upload attendance, Stock Reconciliation and Stock Balance
|
2016-03-11 13:07:49 +05:30 |
|
Valmik Jangla
|
d89dcf60e6
|
Removed from Delivery Note and Appraisal
Added back in Stock Ledger Entry
Added validation in GL Entry and SL Entry
Stock Controller sets Fiscal Year using Posting Date
|
2016-03-11 13:07:48 +05:30 |
|
Valmik Jangla
|
98ec1164fc
|
Removed from Attendance, Upload Attendance, and Sales Order
|
2016-03-11 13:07:16 +05:30 |
|
Valmik Jangla
|
c4c603dcd2
|
Removed from Expense Claim
|
2016-03-11 13:05:19 +05:30 |
|
Anand Doshi
|
22ef68945d
|
[minor] comment about hack
|
2016-03-11 12:47:14 +05:30 |
|
Javier Wong
|
102f9062e8
|
Whitelist get_month_details
This is useful when manually pulling the salary structure in custom scripts for processing of other customized deductables or perhaps contributions.
|
2016-03-08 17:39:58 +05:30 |
|
Rushabh Mehta
|
fe6eadfe22
|
[cleanup] job opening and job applicant
|
2016-03-02 12:53:19 +05:30 |
|
Rushabh Mehta
|
ae7dc31d14
|
Merge pull request #4846 from KanchanChauhan/job-applicant
Added feature to allow people to apply for job from website
|
2016-02-29 17:22:01 +05:30 |
|
Rushabh Mehta
|
a4decc2c59
|
[minor] [test] fix for leap year
|
2016-02-29 14:44:20 +05:30 |
|
Kanchan Chauhan
|
2e8cc89e34
|
Added webform for Job Opening
|
2016-02-19 17:31:13 +05:30 |
|
Anand Doshi
|
6e8eaf097a
|
[fix] test case of Leave Application
|
2016-02-19 00:27:02 +05:30 |
|
Valmik Jangla
|
7ae844f0a0
|
Minor fix
|
2016-02-17 15:06:30 +05:30 |
|
Valmik Jangla
|
b7ae1c1076
|
Inactive employees show up in report
|
2016-02-17 15:05:35 +05:30 |
|
Neil Trini Lasrado
|
25ab93a881
|
Changed image in employee from Attach to Attach Image, removed image view
|
2016-02-17 13:00:37 +05:30 |
|
Anand Doshi
|
870d0441a8
|
[minor] moved make_employee from Employee to Offer Letter
|
2016-02-16 15:53:09 +05:30 |
|
Valmik Jangla
|
5e771c5678
|
Changed doclist to doc
|
2016-02-16 15:33:35 +05:30 |
|
Valmik Jangla
|
93b1072cba
|
Improved code
|
2016-02-16 15:33:35 +05:30 |
|
Valmik Jangla
|
bddc80bc66
|
Make Employee from Offer Letter
|
2016-02-16 15:33:35 +05:30 |
|
Anand Doshi
|
5f72504de1
|
[enhancement] Expense Claim - View Bank Entries
|
2016-02-15 18:02:38 +05:30 |
|
Rushabh Mehta
|
c403ce3b4f
|
Merge pull request #4763 from rmehta/leave-app-cleanup
[cleanup] leave application
|
2016-02-08 18:51:29 +05:30 |
|
Anand Doshi
|
17d4fc4fa7
|
[enhancement] Merge Comment and Feed into Communication 💥
Depends on frappe/frappe#1532
|
2016-02-08 13:06:56 +05:30 |
|
Rushabh Mehta
|
ca2ce13817
|
Merge pull request #4748 from vjFaLk/Monthly-attendance-fix
Employees with no attendance show up as blank now
|
2016-02-08 10:58:45 +05:30 |
|
Rushabh Mehta
|
57fb74f262
|
Merge pull request #4742 from nabinhait/multifixes1
Multi fixes
|
2016-02-08 10:55:48 +05:30 |
|
Rushabh Mehta
|
cde997edfa
|
[cleanup] leave application
|
2016-02-08 10:53:22 +05:30 |
|
Rushabh Mehta
|
65ade073a9
|
Merge pull request #4733 from ShashaQin/patch-15
Update leave_application.py
|
2016-02-08 10:22:09 +05:30 |
|
Valmik Jangla
|
de7e760788
|
Employees with no attendance show up as blank
|
2016-02-05 17:46:14 +05:30 |
|
Valmik Jangla
|
235de6566e
|
Minor fix
|
2016-02-05 15:07:16 +05:30 |
|
Nabin Hait
|
3110c4a772
|
[fix] Make bank entry from expense claim
|
2016-02-04 17:22:57 +05:30 |
|
Valmik Jangla
|
8d0ed21c04
|
Added From and To date to Holiday Report
Changed HD to H in Monthly Attendance Report
|
2016-02-04 12:18:55 +05:30 |
|
ShashaQin
|
995a71c854
|
Update leave_application.py
fix half day leave issue
|
2016-02-03 13:10:15 +08:00 |
|
Valmik Jangla
|
0a76b8b29a
|
Fixed issue where no Holidays would cause the report to break
|
2016-01-30 10:59:40 +05:30 |
|
Anand Doshi
|
6e33d91443
|
[minor] fixes to attendance tool and employee holiday attendance
|
2016-01-29 16:57:54 +05:30 |
|
Valmik Jangla
|
07364f5ece
|
Feature - Employee Attendance Tool
|
2016-01-29 16:57:54 +05:30 |
|
Valmik Jangla
|
1890c794d7
|
Added Employee Report Attendance Report
Made Holiday details mandatory
|
2016-01-29 16:57:54 +05:30 |
|
Saurabh
|
e23e99f4bd
|
[enhance] merge customize buttons under groups
|
2016-01-13 09:18:31 +05:30 |
|
Anand Doshi
|
03e7e581d8
|
[minor] removed Communication table
|
2016-01-06 13:23:45 +05:30 |
|
Rushabh Mehta
|
969d48a554
|
[translations] fixes #4534-38
|
2016-01-04 16:09:40 +05:30 |
|
Nabin Hait
|
b6b56453e1
|
[fix] Get defaults based on doctype or fieldname
|
2015-12-23 16:37:06 +05:30 |
|
Nabin Hait
|
533aba02c5
|
[fix] Payment days calculation in salary slip
|
2015-12-10 10:50:42 +05:30 |
|
Nabin Hait
|
9421e9873a
|
[fix] Allowed import for Expense Claim
|
2015-12-07 10:40:13 +05:30 |
|
Nabin Hait
|
c43a11a313
|
Merge pull request #4431 from nabinhait/leave_fix
[fix] Don't validate balance for lwp and in balance consider all leaves in the allocation period
|
2015-12-05 12:43:38 +05:30 |
|
Nabin Hait
|
d53e780fb8
|
[fix] Don't validate balance for lwp and in balance consider all leaves in the allocation period
|
2015-12-05 12:15:49 +05:30 |
|
Nabin Hait
|
734a40ad62
|
[fix] Offer letter print format fixed
|
2015-12-04 12:19:21 +05:30 |
|
Nabin Hait
|
a4eeb919e6
|
[fix] Set payment days considering joinging date, reliving date and applicable holidays
|
2015-12-03 15:10:30 +05:30 |
|
Nabin Hait
|
c4d9554a05
|
[fix] Payment Days and holidays considering joining and relieving dates
|
2015-12-03 15:10:30 +05:30 |
|
Nabin Hait
|
8df5900f98
|
[fix] Inactive salary structure validation
|
2015-12-02 14:50:08 +05:30 |
|
Anand Doshi
|
602e8253be
|
[enhancement] Int, Currency, Float, Percent as not null and default to 0
|
2015-11-19 13:23:36 +05:30 |
|
Nabin Hait
|
0f72750fc8
|
Merge pull request #4338 from anandpdoshi/fix/salary-slip-earning-deduction
[fix] pull earning and deduction on change of employee
|
2015-11-19 12:06:37 +05:30 |
|
Anand Doshi
|
7763bb5c15
|
[fix] pull earning and deduction on change of employee
|
2015-11-18 19:04:03 +05:30 |
|
Saurabh
|
a4bf02de6c
|
[fixes] overlapping allocation
|
2015-11-18 17:39:26 +05:30 |
|
Saurabh
|
3bcf82c7a6
|
[fixes] test leave allocation record creation
|
2015-11-18 17:39:26 +05:30 |
|
Nabin Hait
|
c7fc11a812
|
[fix] Don't add pagebreak in print format if terms contains only spaces and newlines
|
2015-11-18 12:59:00 +05:30 |
|
Anand Doshi
|
3667da1053
|
[fix] Set user_id as Reply-To in birthday reminder emails
|
2015-11-16 19:31:20 +05:30 |
|
Nabin Hait
|
b3a68c3f40
|
Merge pull request #4323 from nabinhait/leaves
[fix][cleanup] Leave allocation, application and balance report cleanup and fixes
|
2015-11-16 15:57:04 +05:30 |
|
Nabin Hait
|
b6de519571
|
[fix] Test case fixed
|
2015-11-16 15:50:10 +05:30 |
|
Nabin Hait
|
58c4646199
|
[fix][cleanup] Leave allocation, application and balance report cleanup and fixes
|
2015-11-16 15:35:14 +05:30 |
|
Nabin Hait
|
cd87e76d88
|
[fix] Check Salary Structure validity
|
2015-11-15 11:06:55 +05:30 |
|
Rushabh Mehta
|
64e31e9a4e
|
[fix] process payroll
|
2015-11-06 14:47:12 +05:30 |
|
Rushabh Mehta
|
b9e7cb02f4
|
[change-log]
|
2015-11-04 17:02:13 +05:30 |
|
Rushabh Mehta
|
d48c2394e8
|
[cleanup] drop ship testing & cleanup
|
2015-11-04 15:24:04 +05:30 |
|
Rushabh Mehta
|
5951692db0
|
[fix] cleanup stop-resume code
|
2015-11-03 18:20:39 +05:30 |
|
Saurabh
|
20a653e829
|
[fixes] Test case fixes for leave application
|
2015-10-29 14:27:57 +05:30 |
|
Saurabh
|
a2c668cb77
|
[fixes] patch, test cases and validations
|
2015-10-29 14:27:57 +05:30 |
|
Saurabh
|
d0b0a80be3
|
[enhacement] remove fiscal year from leave allocation
|
2015-10-29 14:27:57 +05:30 |
|
Nabin Hait
|
7a9f46d9d1
|
[fix] Value mapping while making bank entry from Expense Claim
|
2015-10-23 13:19:01 +05:30 |
|
Anand Doshi
|
683f756d0f
|
[fix] Fetch company of employee in leave application
|
2015-10-22 18:52:15 +05:30 |
|
Anand Doshi
|
c346484ca4
|
[minor] leave application cleanup
|
2015-10-21 19:56:14 +05:30 |
|
Saurabh
|
ba2133cba2
|
[minor][fix] set default fiscal year for holiday list calendar view
|
2015-10-19 19:20:11 +05:30 |
|
Anand Doshi
|
1d093a4039
|
[fix] change attach fields to small text
|
2015-10-19 12:56:29 +05:30 |
|
Rushabh Mehta
|
ee6862b277
|
[fix] VARCHAR lengths as 140
|
2015-10-14 17:28:35 +05:30 |
|
Anand Doshi
|
71ebad5668
|
Limit varchar length to 140 instead of 255 to mitigate Row Size Too Large error
|
2015-10-14 16:13:49 +05:30 |
|
Rushabh Mehta
|
174299124f
|
[cleanup] [wip] email digest
|
2015-10-14 15:53:37 +05:30 |
|
Rushabh Mehta
|
626ba1bb81
|
[translations] added bn, da-DK, es-PE, si
|
2015-10-14 15:24:42 +05:30 |
|
Saurabh
|
b0dbdc1439
|
minor fixes
|
2015-10-07 11:27:25 +05:30 |
|
Saurabh
|
74eb8e34da
|
[Fixes] minor fix for fiscal year in holiday list
|
2015-10-07 11:17:14 +05:30 |
|
Saurabh
|
1d753c92b1
|
Calendar view for holiday listing
|
2015-10-06 15:21:23 +05:30 |
|
Nabin Hait
|
712b02593a
|
[fix] Month issue fixed in Monthly Attendance Sheet
|
2015-10-01 12:35:54 +05:30 |
|
Anand Doshi
|
0a1d037f01
|
Merge pull request #3974 from rmehta/dms
[enhancement] document management system
|
2015-09-22 14:51:01 +05:30 |
|