Rushabh Mehta
17f6874450
[minor] [fix] doctype_dasboard.py files, move data to get_data
2016-10-18 14:54:39 +05:30
Kanchan Chauhan
dc86964e91
Patch fixed for Employee
2016-10-18 11:29:41 +05:30
Nabin Hait
b3b1219109
Fixed merge conflict
2016-10-17 17:42:53 +05:30
Pawan Mehta
1a96cc1e8d
Fixes 6171 ( #6417 )
...
* [fix] #6171
* [fix] #6171
* [fix] #6171
* [fix] #6171
* [fix] #6171
* [fix] #6171
* [fix] #6171
* [fix] #6171
2016-10-17 17:02:12 +05:30
KanchanChauhan
81581c669f
No Leave allocation for Leave Type for which Leave Without Pay is checked ( #6626 )
2016-10-17 17:01:29 +05:30
Nabin Hait
395d757c5a
Fixed merge conflict
2016-10-17 16:42:49 +05:30
Nabin Hait
cd9c45f816
Fixed merge conflict
2016-10-07 16:53:07 +05:30
Rohit Waghchaure
370e711f48
[Fix] Expense Claim, sanctioned amount not auto-populated from claim amount
2016-10-06 15:19:53 +05:30
Nabin Hait
80499bb657
Fixed merge conflict
2016-09-29 14:18:53 +05:30
Nabin Hait
2e31d7c7bf
[fix] Validate leave application period with salary slip only if leave type is LWP
2016-09-29 10:59:46 +05:30
Kanchan Chauhan
b40c0a917d
[WIP] Process Payroll Changes
2016-09-28 15:14:41 +05:30
Nabin Hait
1e97fc8687
Merge pull request #6460 from KanchanChauhan/salary-slip-fixes
...
[Fix]Salary Slip can be created without salary structure
2016-09-28 12:55:04 +05:30
Faris Ansari
70b7d3280b
added required fields in doctypes for gantt ( #6466 )
2016-09-26 18:20:14 +05:30
Kanchan Chauhan
273c5e71fd
[Fix]Salary Slip can be created without salary structure
2016-09-24 18:56:56 +05:30
robert schouten
147c727743
changed from label based to fieldname based
2016-09-22 08:32:54 +08:00
Nabin Hait
96d38eaac7
Merge pull request #6429 from rohitwaghchaure/minor_fix
...
[Fix] Image is copied when duplicate supplier, employee
2016-09-21 18:40:47 +05:30
Rohit Waghchaure
a7e3d11077
[Fix] Image is copied when duplicate supplier, employee
2016-09-21 18:13:16 +05:30
Kanchan Chauhan
2142a0ab37
[Fix] Indentation fixed
2016-09-21 17:28:42 +05:30
Nabin Hait
521b34c03b
Merge pull request #6413 from KanchanChauhan/salaryslip-docfield-in-condition
...
Salary Slip fields in Condition and Formula
2016-09-21 12:55:27 +05:30
Nabin Hait
081eab147f
Update salary_slip.py
2016-09-21 12:55:16 +05:30
robert schouten
d7721a605d
preferred email for payroll
2016-09-21 11:36:01 +08:00
Nabin Hait
9f4ca1fb9e
set posting date in salalry slip
2016-09-20 18:19:59 +05:30
Nabin Hait
158ac5a844
Merge pull request #6416 from KanchanChauhan/minor-fix
...
[Fix] filters_by_name changed to query_report_filters_by_name
2016-09-20 18:14:00 +05:30
Kanchan Chauhan
77aaa70734
[Fix] filters_by_name changed to query_report_filters_by_name
2016-09-20 17:54:07 +05:30
Kanchan Chauhan
e5057c8c35
Salary Slip fields in Condition and Formula
2016-09-20 14:59:42 +05:30
Nabin Hait
b8eef64e5d
Merge pull request #6325 from RobertSchouten/patch-26
...
fix allow negatives in leave type check
2016-09-20 11:00:31 +05:30
Nabin Hait
79fe1fad5d
Merge pull request #6374 from RobertSchouten/salary_register
...
print formatting for monthly Salary register
2016-09-20 10:58:53 +05:30
Nabin Hait
33ea19d616
Merge pull request #6395 from RobertSchouten/payroll_date
...
[minor] adding Payroll date field to process payroll and salary slip
2016-09-20 10:57:32 +05:30
robert schouten
5c41c77c7e
added posting date to process payroll and salary slip
2016-09-20 08:19:05 +08:00
Nabin Hait
56700ae148
Merge pull request #6356 from KanchanChauhan/job-application-webform
...
Job Application web form
2016-09-15 17:20:43 +05:30
Neil Trini Lasrado
83d81203b2
Added Student Admissions ( #6359 )
...
* Added Student Admissions
* Fixes for Student Application
2016-09-15 14:48:13 +05:30
robert schouten
32c366508a
add print format and id to monthly salary register
2016-09-15 14:21:15 +08:00
Kanchan Chauhan
122d0791a3
Job Application web form
2016-09-13 14:29:02 +05:30
Nabin Hait
fcbb7692fa
Merge pull request #6322 from RobertSchouten/patch-23
...
leave balance now fy not calendar
2016-09-12 18:53:16 +05:30
Nabin Hait
b7c5b76ed1
Merge pull request #6321 from RobertSchouten/patch-22
...
allow users without employee with hr permission to view all calendars
2016-09-12 18:52:45 +05:30
RobertSchouten
f4498307c6
fix allow negatives in leave type check
2016-09-09 11:35:51 +08:00
RobertSchouten
2ecddf58d2
leave balance now fy not calendar
...
changed the default from_date and to_date of Leave Balance Report to FY
2016-09-09 10:48:34 +08:00
RobertSchouten
93c095bf16
allow users without employee with hr permission to view all calendars
2016-09-09 10:15:56 +08:00
RobertSchouten
e4d3809c87
allow users without employee with hr permission to view all calendars
2016-09-09 10:14:07 +08:00
pawan
7b2bd20a09
[fix] #6254
2016-09-06 18:28:41 +05:30
pawan
bd9a275d5f
[fix] #6254
2016-09-02 16:51:22 +05:30
Nabin Hait
d260602cae
Merge pull request #6202 from KanchanChauhan/component-type-added
...
'Type' field added to Salary Component
2016-08-29 16:19:05 +05:30
Kanchan Chauhan
145f87c068
'Type' field added to Salary Component
2016-08-29 15:26:57 +05:30
Nabin Hait
338e63c448
Fixed version conflict
2016-08-29 11:47:50 +05:30
Rushabh Mehta
9d1b56f423
[minor] validate permission in Process Payroll and all products fix for home page
2016-08-29 11:03:10 +05:30
Kanchan Chauhan
22073f3a7f
Layout changes in Salary Structure
2016-08-23 16:14:04 +05:30
Nabin Hait
c95a3180c2
Merge pull request #6127 from KanchanChauhan/demo-fixes-salary
...
Demo updated for new salary structure
2016-08-22 15:22:41 +05:30
Kanchan Chauhan
681a86d70e
[Minor]Fixes
2016-08-22 00:28:20 +05:30
Kanchan Chauhan
db197d593a
Demo updated for new salary structure
2016-08-20 00:30:59 +05:30
Nabin Hait
b5951b72f3
Merge pull request #5924 from KanchanChauhan/salary-structure-changes
...
Formula based Salary Structure
2016-08-18 16:39:58 +05:30
Kanchan Chauhan
bccf0fa041
[WIP] Formula based Salary Structure and multiple employees for same Salary Structure
2016-08-18 13:02:39 +05:30
Abdulla P I
23a6d05622
Update employee_list.js
2016-08-18 12:43:19 +05:30
Rohit Waghchaure
fe913c9969
[Fix] lwp salary structure
2016-08-16 15:43:50 +05:30
Kanchan Chauhan
705384d8fe
Leave Application Validation for processed salary
2016-08-06 13:42:18 +05:30
Neil Trini Lasrado
3e78558357
Moved Intrest to HR module
2016-08-01 15:18:36 +05:30
Nabin Hait
dfcf55d010
Merge pull request #5948 from nabinhait/department_role
...
Assigned permissions for Academic User role in Department
2016-08-01 13:07:02 +05:30
Nabin Hait
86a477d07e
Assigned permissions for Academic User role in Department
2016-08-01 12:51:04 +05:30
Nabin Hait
feed313a66
Delete old salary earning and deduction doctypes
2016-08-01 11:54:19 +05:30
Ben Cornwell-Mott
07e5758a94
Timesheets update on date changes in Salary Slip
2016-07-26 21:00:43 -07:00
Ben Cornwell-Mott
d4d1f1b036
Added date filters for the Timesheet query in Salary Slip
2016-07-26 03:33:38 -07:00
Rushabh Mehta
6c3ac9587e
[fix] quick entry
2016-07-25 15:03:39 +05:30
Rushabh Mehta
e7399dff2d
[fix] homepage patch
2016-07-22 21:01:39 +05:30
Saurabh
9cba6e1f25
[fix] test case fix for expense claim
2016-07-19 11:38:16 +05:30
Saurabh
718d835f45
[enhance] Add Accounts table in to mention expense account based on company #5777
2016-07-19 11:38:16 +05:30
Saurabh
f589c82d68
[enhance] demo for expense claim #5731
2016-07-19 11:38:15 +05:30
Nabin Hait
530b86b9b2
Merge pull request #5752 from KanchanChauhan/employee-holiday-attendance-report-renamed
...
Employee Attendance report renamed to Employees working on a holiday
2016-07-16 10:58:52 +05:30
Rushabh Mehta
55ea7b1f61
[minor] set applicant name automatically
2016-07-15 16:43:25 +05:30
Kanchan Chauhan
9846b945d9
Patch to delete previous report
2016-07-15 14:06:20 +05:30
Kanchan Chauhan
7ff0c4eef4
Employee Attendance report renamed to Employees working on a holiday
2016-07-15 13:42:36 +05:30
Rohit Waghchaure
3bc6a958c7
[Fix] Timesheet overlap issue
2016-07-14 18:27:49 +05:30
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
Anand Doshi
0fd3347148
[fix] handle invalid date in get_retirement_date
2015-09-15 11:29:51 +05:30
Anand Doshi
dbe623b167
[fix] Use User Permission value as default only if the document type is Setup
2015-09-14 13:08:53 +05:30
Anand Doshi
840cad0ff7
Don't copy title field in Duplicate
2015-09-11 12:26:57 +05:30
Anand Doshi
bc1e8b4408
[minor] Unset Apply User Permissions in default permissions
2015-09-08 19:23:23 +05:30
Rushabh Mehta
be9edae961
[fixes] to task test case and fix tree ui for mobile
2015-09-04 16:18:17 +05:30
Rushabh Mehta
4223d7c044
[minor] task not mandatory for Time Log and Expense Claim #3904
2015-09-04 16:18:17 +05:30
Rushabh Mehta
deb38f7a68
[enhancement] document management system
2015-09-02 18:34:24 +05:30
Anand Doshi
8b66f2a691
Exported all doctypes
2015-08-27 16:45:52 +05:30
Rushabh Mehta
81e9d4e8f5
[fix] changed text > text editor for description fields in tables
2015-08-19 13:00:03 +05:30
Rushabh Mehta
cdbb448f6c
[fix] salary slip to consider disable rounded total, #3792
2015-08-13 12:48:04 +05:30
Rushabh Mehta
1828c12481
[refactor] added dynamic link in journal entry, #3847
2015-08-12 12:28:33 +05:30
Nabin Hait
d8546c4316
Fixed include holiday logic in leave calculation
2015-07-30 14:53:27 +05:30
Neil Trini Lasrado
e73941b9cc
Fixes in leave application
2015-07-29 18:39:27 +05:30
Nabin Hait
d1dc622914
[fix][patch] Reload Leave Type
2015-07-29 16:37:02 +05:30
Nabin Hait
b24d2efc4b
[fix] Updated 'Include Holiday' in existing and default leave type records
2015-07-29 16:15:08 +05:30
Nabin Hait
a184fbfa66
Merge branch 'develop' of https://github.com/meatechsupport/erpnext into meatechsupport-develop
2015-07-29 16:05:47 +05:30
Anand Doshi
0e6f2474e8
[minor] removed trailing space in offer letter status
2015-07-29 11:27:02 +05:30
Meatechsupport
e102332f08
removed testcase
2015-07-28 19:03:30 +04:00
Meatechsupport
145227e4ec
Edited the Test case
2015-07-28 18:39:04 +04:00
Meatechsupport
8b96fdac12
Indentation Error
...
realligned
2015-07-27 16:55:54 +04:00
Meatechsupport
e319598c51
IndentationError
...
alligned code
2015-07-27 16:42:22 +04:00
Meatechsupport
5c73bafeaa
Modifying the number of leave days calculation part.
...
we don't need to exclude the Holiday list (that comes in between) from the total number of leaves applied.
Add option in the leave type
added a field in the leave type to include and exclude the holidays from
the tolal leave applied days
Added the field
Added a field Include Holiday to leave Type doctype
changed the lable
changed the lable from "Include Holiday" to "Include holidays within leaves
as leaves"
Rearranged the function
moved holidays = leave_app.get_holidays() under if
Corrected 'total_leave_days' : flt(tot_days)-flt(holidays)
Adding test case
added the test case
Added test case
Added test case to test_leave_application.py
adding default value
added default value and corrected the syntax.
IndentationError
removed extra tabs after
2015-07-27 13:46:00 +04:00
Anand Doshi
d0d1af2072
Merge pull request #3696 from nabinhait/fix1
...
[fix][report] Show only active employee in Employee leave balance report
2015-07-20 13:27:47 +05:30
Nabin Hait
c9e4fbeda0
[fix][report] Show only active employee in Employee leave balance report
2015-07-20 12:57:48 +05:30
Neil Trini Lasrado
feda4f9bc9
Default Expense Account added to Expense Claim Type. Fetch account while making Bank Entry
2015-07-16 15:44:56 +05:30
Rushabh Mehta
94157334a7
[rename] Material User > Stock User
2015-07-13 15:06:12 +05:30
Neil Trini Lasrado
4089b3d376
Salary Slip renamed to Process Payroll
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
6cfab43d5f
Renamed Depends on LWP field in the Earning and Deduction table of Salary Slip.
2015-07-13 12:41:27 +05:30
Rushabh Mehta
ccb9117ba5
[minor] Added employees in Newsletter List
2015-07-09 13:56:02 +05:30
Nabin Hait
4017bfcd2e
Merge pull request #3591 from rmehta/salary-manager-fix
...
[fixes] salary manager #3554
2015-07-08 15:39:33 +05:30
