Nabin Hait
007c87ea63
Merge pull request #7440 from nabinhait/gle_repost_optimization
...
Optimization to reduce GLE reposting time for future stock transactions
2017-01-13 11:33:42 +05:30
Kanchan Chauhan
7933eb685c
[Enhancement] Attendance Module
2017-01-12 17:24:53 +05:30
Kanchan Chauhan
2f3ae914a6
Changes to Salary Register
2017-01-11 19:45:01 +05:30
RicardoJohann
7182de7684
allowed rename salary structure
2017-01-11 06:28:59 -02:00
Nabin Hait
51d45d8bce
Fixed merge conflict
2017-01-10 12:32:01 +05:30
Kanchan Chauhan
2b41f9d548
[Fix] Payroll Frequency toggle fix
2017-01-09 18:43:52 +05:30
Rushabh Mehta
8b133ac087
[minor] [tests] fix, tests will fail on the 5th of a month!
2017-01-06 17:21:04 +05:30
Kanchan Chauhan
b7cc393eb8
Email ID renamed to Email Address
2017-01-03 16:45:38 +05:30
Nabin Hait
ab42fc006f
Merge branch 'master' into develop
2017-01-02 17:26:55 +05:30
Kanchan Chauhan
5594050104
[Fix] Attendance validation in Leave Application
2017-01-02 11:14:44 +05:30
KanchanChauhan
4601fdd98d
Better Salary Slip logs in Process Payroll ( #7322 )
2016-12-30 16:26:55 +05:30
Nabin Hait
9784d27317
Optimization to reduce GLE reposting time for future stock transactions
2016-12-30 16:21:35 +05:30
Nabin Hait
e97d40806f
Merge branch 'master' into develop
2016-12-30 14:56:20 +05:30
Kanchan Chauhan
7b29dc7208
[Fix] Monthly Salary Register Fix
2016-12-30 12:36:00 +05:30
Nabin Hait
58291c77e9
Fixed version conflict
2016-12-23 17:43:42 +05:30
Nabin Hait
c2d66bdfb2
Merge branch 'master' into develop
2016-12-23 16:45:09 +05:30
Rohit Waghchaure
1af1a43616
[Enhancement] Setting to maintain the work hours and bill hours same on the timesheet
2016-12-21 19:19:16 +05:30
Kanchan Chauhan
58ed0c6efa
Create User button in Employee if no User ID selected
2016-12-21 16:18:59 +05:30
Rushabh Mehta
2a86c32267
[minor] [patch] remove icon if present, fixes #6949
2016-12-20 12:20:39 +05:30
Rushabh Mehta
827588adf2
[minor] fixes to job opening
2016-12-19 17:06:26 +05:30
Rushabh Mehta
c3d8479443
[minor] allow website user to be selected as employee
2016-12-19 12:32:11 +05:30
Rohit Waghchaure
61fb496be6
[Fix] Test case
2016-12-16 12:19:56 +05:30
Nabin Hait
f02f1bb0c7
Added standard filters
2016-12-15 14:57:20 +05:30
Rushabh Mehta
01fab2ae1c
[minor] fix salary slip test
2016-12-15 11:43:29 +05:30
Rushabh Mehta
e9d9b8e6f0
[fix] demo and process payroll for demo ( #7224 )
...
* [fix] demo and process payroll for demo
* [fix] set payroll dates
2016-12-15 11:27:35 +05:30
Nabin Hait
1ae8e2c8fa
Revert "Revert "email cc test fixes for frappe/frappe#2441"" ( #7232 )
2016-12-15 11:27:02 +05:30
Rushabh Mehta
9b049ee154
Revert "[Fixes]Payroll Fixes" ( #7225 )
2016-12-14 18:25:11 +05:30
Nabin Hait
42b6e37d15
Merge pull request #7216 from KanchanChauhan/salary-fixes
...
[Fixes]Payroll Fixes
2016-12-14 16:20:08 +05:30
Kanchan Chauhan
c292dd7213
[Fixes]Payroll Fixes
2016-12-14 15:50:54 +05:30
Nabin Hait
36f5471bab
Merge pull request #6855 from neilLasrado/training
...
[new Feature] Added Training Module
2016-12-14 12:51:51 +05:30
Nabin Hait
44cdbbe346
Merge pull request #7203 from KanchanChauhan/employee-permissions
...
[Minor] Read permissions to Employee on Activity Type and Appraisal Template
2016-12-14 12:50:54 +05:30
Neil Trini Lasrado
6a2fa29b4a
Fixes for training Module
2016-12-14 12:08:28 +05:30
Neil Trini Lasrado
984ee372e8
[new Feature] Added Training Module
2016-12-13 15:42:12 +05:30
Nabin Hait
201af80706
Fixed merge conflict
2016-12-13 14:30:32 +05:30
Kanchan Chauhan
b79aa1d091
[Minor] Read permissions to Employee on Activity Type and Appraisal Template
2016-12-13 14:16:57 +05:30
Nabin Hait
8ecc14b7bd
Revert "email cc test fixes for frappe/frappe#2441"
2016-12-13 14:11:49 +05:30
Kanchan Chauhan
d917b66a31
[Fix] Salary Slip test cases fix
2016-12-13 12:12:49 +05:30
Nabin Hait
ee877fd631
Merge pull request #7199 from RobertSchouten/email_cc_dev
...
email cc test fixes for frappe/frappe#2441
2016-12-13 11:31:06 +05:30
robert schouten
3d22eb1d59
email cc test fixes for frappe/frappe#2441
2016-12-13 11:32:09 +08:00
Kanchan Chauhan
f0b0db444d
Added Is Active to Sales Person
2016-12-12 19:12:41 +05:30
Kanchan Chauhan
0ece9e0e2e
[Fix] Salary Slip Test cases fix
2016-12-08 17:02:36 +05:30
Kanchan Chauhan
f7b25cbb6b
[WIP] Payroll Updates
2016-12-08 12:20:20 +05:30
Nabin Hait
5c18bd9b61
Fixed merge conflict
2016-12-06 16:16:58 +05:30
Nabin Hait
45fda8a257
Merge pull request #7149 from KanchanChauhan/salary-slip-validation-in-leave
...
[Minor] Validation fixes in Leave Application and Monthly Salary Register Fix for other laguages
2016-12-06 16:01:38 +05:30
Nabin Hait
67d226f491
Merge pull request #7127 from KanchanChauhan/salary-slip-fix
...
[Fix] lwp issue fixed for salary slip without salary structure
2016-12-06 15:48:47 +05:30
Nabin Hait
9313a7408c
Merge pull request #7144 from rohitwaghchaure/report_builder_total_row_issue
...
[Enhancement] Total row added for report builder
2016-12-06 15:42:19 +05:30
Kanchan Chauhan
dc80b35104
[Minor] Apply Salary Slip validation only if it is submitted
2016-12-06 15:37:24 +05:30
Rohit Waghchaure
6f6a533d66
[fix] salary slip working days
2016-12-05 23:33:02 +05:30
Rohit Waghchaure
36a01d3464
[Enhancement] Total row added for report builder
2016-12-05 18:59:59 +05:30
Rushabh Mehta
323c06ebbf
[minor] rename icons as per FontAwesome 4 ( #7136 )
2016-12-05 14:17:26 +05:30
Kanchan Chauhan
4a888b4c91
[Fix] lwp issue fixed for salary slip without salary structure
2016-12-04 13:42:30 +05:30
Kanchan Chauhan
faa525e4f1
[Fix] Fixed condition and formula issue in Salary Slip
2016-12-01 15:31:38 +05:30
Rushabh Mehta
4e61564f73
[minor] fixes to daily work summary formatting
2016-11-22 21:59:20 +05:30
Rushabh Mehta
557e7f787b
[minor] UX fixes for Daily Work Summary
2016-11-21 12:10:44 +05:30
Rushabh Mehta
9dd58d42df
[fix] test cases and final wiring for daily work summary
2016-11-18 12:40:18 +05:30
Rushabh Mehta
c10d2a0025
[wip] daily work summary
2016-11-18 12:40:18 +05:30
Rushabh Mehta
fe816c3852
[fix] [wip] daily work summary
2016-11-18 12:40:18 +05:30
Nabin Hait
46753de6d7
fixed merge conflict
2016-11-17 15:55:11 +05:30
Nabin Hait
d4e8b297cd
Merge pull request #6784 from RobertSchouten/calendar_fix
...
[fix] calendar range fixes
2016-11-17 14:45:59 +05:30
Kanchan Chauhan
7652b857c8
[Fix] Filters to get employee in Payroll
2016-11-16 15:29:01 +05:30
Nabin Hait
6d04afc19d
fixed merge conflict
2016-11-16 12:56:31 +05:30
Nabin Hait
00e841d744
update missing salary component abbr
2016-11-16 12:55:17 +05:30
Rushabh Mehta
4bfa0748cd
[merge] master
2016-11-16 11:28:23 +05:30
Rushabh Mehta
8dfbe7c748
[fix] patch missing salary component type based on existing salary slips ( #6955 )
2016-11-16 11:18:20 +05:30
Nabin Hait
95e6ccd419
Merge branch 'master' into develop
2016-11-14 12:42:26 +05:30
Nabin Hait
598a0c918d
[fix] fixed student dashboard issue ( #6897 )
2016-11-10 17:25:37 +05:30
Nabin Hait
a469e659c5
Fixed merge conflict
2016-11-08 15:26:27 +05:30
Rushabh Mehta
13fc52d713
[minor] added default standard filters ( #6854 )
2016-11-07 17:19:19 +05:30
KanchanChauhan
dd01bcc485
Get employee details in Salary Slip ( #6837 )
2016-11-07 17:09:07 +05:30
Nabin Hait
f5d8dd3b18
Fixed merge conflict
2016-11-04 16:54:53 +05:30
Nabin Hait
81f7a265bc
Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value
...
Remember last selected value for link field
2016-11-04 16:13:49 +05:30
Kanchan Chauhan
63dda84862
[Fix] Error in pulling in Salary Structure fixed
2016-11-04 12:58:05 +05:30
Rohit Waghchaure
0d2f7e62c0
set remember last selected value as true for company field
2016-11-03 16:19:34 +05:30
Rohit Waghchaure
3844d2cc01
Remember last selected value for link field
2016-11-03 14:49:27 +05:30
Rushabh Mehta
e855f53f08
[minor] fix ellipsis style
2016-11-02 07:34:17 +05:30
robert schouten
bb79fc5b0c
[fix] calendar range fixes
2016-11-01 17:14:51 +08:00
Nabin Hait
df366a6e9c
Merge pull request #6683 from KanchanChauhan/multiple-active-salary-slio
...
Warning if there are mutliple active salary structures
2016-10-24 11:23:57 +05:30
Mainul Islam
a964db7821
Add multiple emoloyee in salary structure ( #6621 )
...
* Add multiple emoloyee in salary structure
* Added in Menu
* Remove Default Value from Company field
* Change Section Label
* Added Button in Salary Structure and set route_options
* Remove Single Doctype
* Add Dialog for Employee Add
* View Employee and Check or Uncheck
* Complete Multiple Employee Add in Employee Table and Neve Entry in Duplicate in Employees
* Employees View Section in Dialog Added Employe Name and set Employee Id as Title
* Delete SIngle Doctype
* Chagne to
* Remove checkbox
* Remove add button and set primary button
2016-10-24 11:22:00 +05:30
Nabin Hait
6ef8ede280
Merge pull request #6675 from KanchanChauhan/holiday-in-lwp-salaryslip
...
include_holiday being taken into consideration while calculating lwp
2016-10-24 11:19:43 +05:30
Nabin Hait
5ced4dfe34
Merge pull request #6673 from KanchanChauhan/max-leave-days-in-leave-application-hotfix
...
[Fix] leave application days should be less than max days leave allowed
2016-10-24 11:18:44 +05:30
Nabin Hait
8918dcf54e
Merge pull request #6678 from KanchanChauhan/total-leave-days-updated
...
Total leave days gets updated on date change
2016-10-24 11:13:31 +05:30
Kanchan Chauhan
29ce0aab28
Warning if there are mutliple active salary structures
2016-10-22 20:48:44 +05:30
Kanchan Chauhan
c4c966691f
[Fix] Make Bank Entry button depends_on fixed
2016-10-22 18:04:48 +05:30
Kanchan Chauhan
a084405bca
Total leave days gets updated on date change
2016-10-22 11:55:51 +05:30
Kanchan Chauhan
a1006c0549
include_holiday being taken into consideration while calculating lwp
2016-10-21 17:53:15 +05:30
Kanchan Chauhan
24d580206a
[Fix] leave application days should be less than max days leave allowed
2016-10-21 13:01:33 +05:30
Saurabh
bc0783b527
[fix] duplicate columns in monthly salary report #6623
2016-10-20 12:55:23 +05:30
Nabin Hait
97fa119b37
Set prefered contact email in Employee
2016-10-19 18:26:01 +05:30
Nabin Hait
0702fa2fc6
Fixed version conflict
2016-10-19 16:49:36 +05:30
Nabin Hait
ff183eedb9
Fixes for testcases
2016-10-19 14:23:02 +05:30
Nabin Hait
fa1cdd5bf0
Fixed merge conflict
2016-10-18 15:37:33 +05:30
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
Rushabh Mehta
f9b356992a
[fixes] salary manager #3554
2015-07-07 16:30:29 +05:30
Nabin Hait
526957505f
Merge pull request #3569 from rmehta/employee-unset-user-id
...
[fix] remove user permission if user id is unset #3447
2015-07-06 14:27:22 +05:30
Tsutomu Mimori
5a0fbff1a3
#3402
2015-07-03 16:08:02 +09:00
Rushabh Mehta
5688a6c31a
[fix] remove user permission if user id is unset #3447
2015-07-03 11:34:53 +05:30
Neil Trini Lasrado
086f8942eb
Fixed bugs in Calender View for Leave Application
2015-06-22 13:51:56 +05:30
Nabin Hait
5d0ce7939f
Show only users with Expense Approver role in Expense Claim Approver field
2015-06-15 17:59:37 +05:30
Neil Trini Lasrado
82cc2921d1
Validation added to prevent user from creating salary structure with 'From Date' before employee 'Date of joining'
2015-06-12 18:34:08 +05:30
Nabin Hait
0b18a2d347
Reset values in tools like Payment Tool
2015-06-05 12:01:29 +05:30
Nabin Hait
3ebfad7115
minor fixes
2015-06-01 14:01:56 +05:30
Nabin Hait
e2c200a91e
Make gl entry for rounded-off amount
2015-05-29 10:39:09 +05:30
Nabin Hait
2eba53f763
test case fixes
2015-05-22 16:55:55 +05:30
Rushabh Mehta
9dd8aab211
[fix] status updater
2015-05-18 11:19:10 +05:30
Neil Trini Lasrado
2edc91bc52
Leave Type - LWP changed to Leave Without Pay
2015-05-11 14:38:21 +05:30
Neil Trini Lasrado
ec2f3d6e63
leave_allocation layout changed
2015-05-11 14:38:20 +05:30
Rushabh Mehta
82ee5fdba6
[email] changes in email_account api
2015-05-04 18:17:22 +05:30
Nabin Hait
fb1f4a5c58
User permissions for Expense Claim
2015-05-02 18:46:29 +05:30
Rushabh Mehta
5e13799704
[fixes] leave approver selection and cleaned up layout
2015-04-30 12:55:10 +05:30
Nabin Hait
4669fe3e85
minor fix
2015-04-22 15:34:44 +05:30
Neil Trini Lasrado
ecb5d11e2d
Today added as default date for posting date in expense claim
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
5e317d2b72
fixes in Expense Claim and get_avtivity_cost function
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
d4b33d3c14
Costing added in Time log Batch, Sales Order added to Project + more fixes
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
4e6e4726a4
filters added, ui change, update project moved to project.py
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
ec5c66f8f0
Title Feild added to Expense Claim
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
05f15bbb88
fixes in Test Cases
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
2679b247b3
fixes in Expense Claim
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
7f9ea3bf6a
expense claim test records
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
a11770f06f
in Time Log - Server side validations added to recalculate cost on save
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
50234cb0fe
Task added to expense claim
...
all cost (expense claim and time log) against Task; task updates project cost.
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
458b8885f0
New Document Activity Cost created.
...
In TL - billing rate and internal rate added
In Project - total expense claim and total activity cost. Buttons addded - show time logs and show expense claims.
In Expense Claim - Employee and project link added. update cost in project on submit and on trash. Validation added to check sanctioned amount is not greater than claim amount.
2015-04-22 11:25:57 +05:30
Rushabh Mehta
80f8b7be2f
[minor] [perms] Expense Claim Type
2015-04-19 16:18:15 +05:30
Rushabh Mehta
2dea40f7be
[leave-allocation] can cancel and re-submit or make a new one, fixes frappe/erpnext#3042
2015-04-15 15:08:48 +05:30
Anand Doshi
00a07de426
fixed test earning type
2015-04-08 21:49:11 +05:30
Anand Doshi
2f87fb41fa
Merge pull request #3069 from neilLasrado/dob
...
validation added - dob cannot accept a future date
2015-04-08 13:25:01 +05:30
Anand Doshi
a1a3468704
Merge pull request #3068 from neilLasrado/leaves
...
Bug Fixes
2015-04-08 13:20:18 +05:30
Neil Trini Lasrado
4b29ccc2b0
Salary Structure - Earnings made mandatory
2015-04-08 12:29:40 +05:30
Neil Trini Lasrado
4ba4d9dbef
fix - update button didnt work in leave allocation after submit
2015-04-08 12:29:40 +05:30
Neil Trini Lasrado
20f0ef2515
validation added - dob cannot accept a future date
2015-04-08 12:29:01 +05:30
Neil Trini Lasrado
28b0cc4d0b
fixes in offer letter
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
496e277d8a
print format added
2015-04-08 12:28:21 +05:30
Rushabh Mehta
aca5cb6513
[fixes] offer letter
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
8ca547b7f2
terms view added
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
e1d620b168
Offer Letter - New Doctype added and job_applicant naming changed
2015-04-08 12:28:20 +05:30
Rushabh Mehta
ffc190d34d
Merge pull request #3013 from neilLasrado/expense
...
Expense Claim - 'Total Amount Reimbursed' feild added
2015-04-02 14:29:29 +05:30
Anand Doshi
7b6daafbb9
[minor] left aligned email footer, raise duplicate entry error for common email id in Employee and Sales Person
2015-04-01 16:26:59 +05:30
Anand Doshi
ee57a8d2a4
[hotfix] unique job applicant
2015-04-01 12:29:30 +05:30
Anand Doshi
d6a360b51b
[fix] check job application unique email id
2015-03-30 21:11:34 +05:30
Neil Trini Lasrado
a6b3415cdd
Expense Claim - 'Total Amount Reimbursed' feild added
2015-03-26 14:13:44 +05:30
Rushabh Mehta
04f907efcf
[fix] job applicant (test via import)
2015-03-23 15:44:54 +05:30
Rushabh Mehta
c2eae25d0e
[cleanup] validate_email_add
2015-03-23 14:10:51 +05:30
Anand Doshi
9d8154dd40
fixed test cases
2015-03-18 16:22:13 +05:30
Anand Doshi
ec5ec60764
Fixed Test Cases
2015-03-05 19:31:40 +05:30
Rushabh Mehta
2cc585f180
[git fixes] salary manager, time log title, notificaitons
2015-03-03 16:06:54 +05:30
Nabin Hait
56c6a65a22
argument name fix in sendmail
2015-03-03 15:48:33 +05:30
Anand Doshi
885e074697
Changed company name from Web Notes to Frappe Technologies
2015-03-03 14:56:43 +05:30
Nabin Hait
786472279a
salary slip calculation: trigger on
2015-03-03 14:07:21 +05:30
Rushabh Mehta
c37281e59c
Merge pull request #2897 from neilLasrado/job-application
...
job application fixed
2015-03-02 19:01:16 +05:30
Neil Trini Lasrado
96bc31db27
job application fixed
2015-03-02 18:54:45 +05:30
Rushabh Mehta
910ba02f49
Merge pull request #2896 from neilLasrado/employee-report
...
employee information report fix
2015-03-02 18:31:47 +05:30
Neil Trini Lasrado
71a651ec21
employee information report fix
2015-03-02 18:13:25 +05:30
Neil Trini Lasrado
fd0920fe83
Fixes in Appraisal doc
2015-03-02 17:33:48 +05:30
Anand Doshi
d35354cc06
Merge remote-tracking branch 'frappe/develop' into v5.0
...
Conflicts:
erpnext/__version__.py
erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
erpnext/hooks.py
erpnext/patches.txt
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
erpnext/stock/get_item_details.py
erpnext/translations/ar.csv
erpnext/translations/bs.csv
erpnext/translations/ca.csv
erpnext/translations/el.csv
erpnext/translations/es.csv
erpnext/translations/fr.csv
erpnext/translations/hr.csv
erpnext/translations/id.csv
erpnext/translations/is.csv
erpnext/translations/ja.csv
erpnext/translations/nl.csv
erpnext/translations/pl.csv
erpnext/translations/pt-BR.csv
erpnext/translations/ru.csv
erpnext/translations/tr.csv
erpnext/translations/zh-cn.csv
erpnext/translations/zh-tw.csv
setup.py
2015-02-24 18:12:17 +05:30
Anand Doshi
d57e793bf3
[fix] Added unicode_literals if missing in py files
2015-02-24 12:24:53 +05:30
Rushabh Mehta
d54031f3b5
[tests] [projects] merged tasks and projects and added quick edit of tasks from projects
2015-02-22 22:32:39 +05:30
Rushabh Mehta
813f0eda05
[form] section labels
2015-02-20 16:02:48 +05:30
Rushabh Mehta
50dc4e90e3
[cleanup] item grid views, removed desc etc
2015-02-19 20:05:45 +05:30
Rushabh Mehta
d60acb9f26
[fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation
2015-02-19 14:53:31 +05:30
Nabin Hait
8fa503e177
Fixed conflict while merging v4 into v5
2015-02-10 16:44:00 +05:30
Nabin Hait
15cd12214e
Fixed conflict while merging v4 into v5
2015-02-10 16:37:18 +05:30
Anand Doshi
6dfd430a2f
Moved flags like ignore_mandatory, ignore_validate etc to doc.flags
2015-02-10 14:41:27 +05:30
Rushabh Mehta
a232c80d77
[share] add share permission
2015-02-05 15:52:58 +05:30
Do Le Bao Nguyen
f9b63dd36a
Look like a minor bug
...
- There is no frappe.get_default but only frappe.db.get_default ?
- Error return if selecting Employee in Salary Slip without specifying the Fiscal Year first
2015-02-03 11:10:09 +08:00
Rushabh Mehta
06fa46fafe
[fix] onshow > on_page_show
2015-01-29 18:09:11 +05:30
Rushabh Mehta
5bceebc6a1
[fix] fixes birthday reminders #2021
2015-01-23 15:22:30 +05:30
Rushabh Mehta
0335005eea
[minor] added allow rename
2015-01-15 15:29:22 +05:30
Nabin Hait
fff3ab752c
Fixed conflict
2015-01-14 16:27:13 +05:30
Nabin Hait
024b537b7f
Merge pull request #2557 from neilLasrado/spelling-of-approver
...
Spelling Correction - Leave application #2552
2015-01-12 17:02:10 +05:30
Rushabh Mehta
d49a123fd0
[ui] listviews
2015-01-07 16:43:47 +05:30
Neil Trini Lasrado
1b7d66fab6
Update leave_application.js
2015-01-07 11:16:41 +05:30
Nabin Hait
56ac3fb29d
some fixes for renaming patch
2015-01-01 13:40:54 +05:30
Rushabh Mehta
419ae33c3e
[merge] v5-design
2014-12-31 15:03:14 +05:30
Nabin Hait
54361e8651
fixed conflict while merging develop into v5
2014-12-31 13:24:36 +05:30
Rushabh Mehta
f870527e7c
[design] wip
2014-12-26 12:52:11 +05:30
Nabin Hait
79f091e2fe
field renaming
2014-12-26 11:41:15 +05:30
Nabin Hait
4b8185db19
renaming: entries
2014-12-25 18:19:39 +05:30
Nabin Hait
23d2a53017
Code replacement for journal voucher renaming
2014-12-25 17:14:18 +05:30
Nabin Hait
e7d153624f
Table Field Renaming: code replace, JV and budget distribution renamed
2014-12-25 16:01:55 +05:30
Nabin Hait
d8f4984d71
Table fieldnames renaming: updated json and patch
2014-12-24 17:04:48 +05:30
Nabin Hait
0741ed3a82
Merge pull request #2472 from neilLasrado/expense-claim
...
New feature for issue #2419
2014-12-23 18:07:38 +05:30
Neil Trini Lasrado
41781ce686
test case fix - holiday list
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
e84fa67f30
Actual operating cost, Actal operating time added to 'production order operations' - auto fetched based on 'time log' creation 'make time log' button appears only if 'production order' document is submitted server side validation added to check if 'Production Order' mentioned on 'Time Log' is in submit state test cases added to check all of the above
...
Time Log Bug Fixed
Manufacturing seetings doctype added.
prod order holiday list time calculation added
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
5ec7542519
Holiday List name changed and workstation filter added to time log
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
637d804abd
Operations added in Production Order DocType Auto-Fetch added to operations in Production Order DocType made operations in production order read-only capacity & duration of cycle added to workstation workstation operation timings added operation master added, Time log added Time Log Fixed Test Records added to Production Order Test Recorde for over Production Time Log added Validation added to check if time log timings are within working hours of the workstation. Validation added to check if workstation is closed on time log dates. Test Case added for Time Log
2014-12-23 17:38:59 +05:30
Anand Doshi
f87a622ef0
[minor] use frappe.attach_print() in salary slip and recurring document
2014-12-15 23:14:35 +05:30
Nabin Hait
606af96c9f
minor fix
2014-12-15 11:57:19 +05:30
Neil Trini Lasrado
e1f21682fb
changes made
2014-12-12 13:09:42 +05:30
Neil Trini Lasrado
f13c4f0145
New feature for issue #2419
2014-12-12 12:33:55 +05:30
Nabin Hait
5cafcf66b0
Leave application fix
2014-12-10 23:59:04 +05:30
Nabin Hait
690bcd7b66
Added leave approver name field in leave application
2014-12-09 16:36:33 +05:30
Rushabh Mehta
3d65d9602e
[error-reports]
2014-11-28 14:58:43 +05:30
Rushabh Mehta
6d950d23a8
[merge]
2014-11-28 12:08:51 +05:30
Nabin Hait
eba88919c1
Merge pull request #2431 from mayur-patel/patch-2
...
Update leave_application.py : Modified get_holidays function
2014-11-25 10:55:11 +05:30
Nabin Hait
ea91d2aaf1
Merge pull request #2429 from ankitjavalkarwork/expclaimname
...
Add configurable naming series to Expense claim
2014-11-25 10:51:03 +05:30
Mayur Patel
5d8635a8dc
Update leave_application.py
...
See issue #2422 for more detail.
2014-11-24 16:57:53 +00:00
ankitjavalkarwork
7e911bae95
Add configurable naming series to Expense claim
2014-11-24 18:26:17 +05:30
Nabin Hait
0ad7db3bbd
Minor fix in salary slip net total calculation
2014-11-24 15:25:13 +05:30
ankitjavalkarwork
16e2c18c64
Delete events linked with employee on deletion of Employee
2014-11-10 18:08:23 +05:30
Nathan Do
8a55d9a795
Remove get_server_field from leave_application
...
- Make get_holidays and get_total_leave_days global to module
- Replace get_server_field with using whitelisted function
get_total_leave_days
2014-11-05 12:32:57 +08:00
Nabin Hait
a5082d6233
Merge pull request #2283 from neilLasrado/employee-reports-to
...
employee cannot report to himself validation added to employee doctype
2014-10-10 15:20:13 +05:30
Neil Trini Lasrado
9b08062bed
employee cannot report to himself validation added to employee doctype
2014-10-09 17:26:17 +05:30
Neil Trini Lasrado
9614b552fd
fiscal year auto-fetch added to c-form, installation_note, stock_reconciliation, customer_issue, maintanence_visit & removed for Expense Claim
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
565d986198
fiscal year auto fetch added to oppurtunity, quotation, material request, supplier quotation, expense claim doctypes + issues fixed
2014-10-09 15:01:12 +05:30
Nabin Hait
c68646c694
[merge] 4.x to 5.0
2014-10-06 12:57:48 +05:30
Rushabh Mehta
bf8715dba4
[refactor] used frappe.sendmail
2014-09-16 15:12:18 +05:30
Rushabh Mehta
5cdc8e560c
[mailbox] removed separate email settings for jobs, sales, support
2014-09-16 15:12:18 +05:30
Rushabh Mehta
e10cf021d9
[email] remove communicationlist #561
2014-09-16 15:12:18 +05:30
Rushabh Mehta
ce00772ac0
[cleanup] removed communication js, fields
2014-09-16 15:11:42 +05:30
Rushabh Mehta
c0bb453b88
[refactor] [frappe 5.0]
2014-09-16 15:10:54 +05:30
Rushabh Mehta
ed37cef32a
[refactor modules]
2014-09-16 15:08:02 +05:30
Anand Doshi
30c5b41398
[minor] removed Suggest
2014-09-15 16:43:34 +05:30
81552433qqcom
1c440b3b31
month options doesn't get translated.
2014-09-12 16:07:12 +05:30
81552433qqcom
951da0ca3d
added translations to report py file.
2014-09-12 16:07:12 +05:30
Anand Doshi
fc33d5a75b
Set allow_on_submit for 'page_break', 'letter_head', 'select_print_heading', 'print_heading'. Fixes frappe/erpnext#1810
2014-09-09 15:25:43 +05:30
Anand Doshi
0b74b6d98c
[fix] Validate Expense Approver
2014-09-05 14:41:53 +05:30
Anand Doshi
bb370f3b6a
HR - Leave Approver and Expense Approver fields changed to Link Fields, better default permissions
2014-08-29 11:19:10 +05:30
Rushabh Mehta
e8dd4160d4
[cleanup] remove allow_attach
2014-08-25 13:04:21 +05:30
Anand Doshi
e4c434ab6f
[fix] Leave Application Calendar
2014-08-18 17:04:04 +05:30
Rushabh Mehta
ab8bde0149
[ux] added folds, show actual / projected qty in pos
2014-08-14 11:43:46 +05:30
Anand Doshi
26201a5828
[fix] Show Employee Name in Employee Birthday report
2014-08-08 12:49:11 +05:30
Anand Doshi
4cc94df752
[tests] Fixed Test Records
2014-08-08 11:56:32 +05:30
Rushabh Mehta
7a4e739d6c
templating for hr
2014-08-08 11:56:32 +05:30
Rushabh Mehta
8544447b19
added more listview templates
2014-08-08 11:56:32 +05:30
Rushabh Mehta
995185d02d
[ux] fixed primary action
2014-08-08 11:51:23 +05:30
Nabin Hait
7881df2138
minor fix
2014-08-06 17:29:07 +05:30
Nabin Hait
9f7e00bb3a
Send salary slip mail after submit via Salary Manager
2014-08-06 17:25:23 +05:30
Nabin Hait
45b7d17ee8
Employee can be reselected but not changed in salary structure
2014-08-06 17:25:23 +05:30
Anand Doshi
35cc320e21
[fixes] Leave Application and Toggle Rounded Totals
2014-07-30 17:00:26 +05:30
nabinhait
16317748dd
Issue fixes related to length of the report result
2014-07-28 16:41:34 +05:30
Anand Doshi
62b1cbf003
[impact] Limit available functions in jinja environment
2014-07-25 13:02:29 +05:30
Anand Doshi
a5437cdac1
Fixes for print
2014-07-25 13:02:28 +05:30
Rushabh Mehta
5b51cc86a9
many fixes to print
2014-07-25 13:01:53 +05:30
Anand Doshi
df7f1c17ac
Fixed Employee Birthday Report
2014-07-02 17:35:00 +05:30
Anand Doshi
4aa2380de2
Fixed get_sender for Sales and Jobs
2014-06-30 12:19:22 +05:30
Anand Doshi
83da92fdcc
Naming Series Property Setter Patch
2014-06-23 18:04:07 +05:30
Anand Doshi
31c977b906
Fixed Employee Leave Balance Report
2014-06-18 16:26:45 +05:30
Nabin Hait
589a298096
Minor fixes in salary manager. Fixes #1754
2014-06-11 13:00:31 +05:30
Anand Doshi
04badf7e6e
Hotfix: module name case for HR
2014-06-06 15:29:55 +05:30
Anand Doshi
171c00cfd6
Reload permissions for master and setting documents
2014-06-06 15:13:20 +05:30
Anand Doshi
ede8ea52b0
Fixes
2014-06-05 18:06:20 +05:30
Rushabh Mehta
41471c3b44
fixed description in salary manager
2014-06-05 16:01:55 +05:30
Anand Doshi
85479bcbc0
Fixes for apply user permissions and momentjs
2014-06-04 18:15:43 +05:30
Anand Doshi
ec8240e890
Apply User Permissions optional in Script and Query Reports
2014-06-04 17:48:58 +05:30
Anand Doshi
38dedf402b
Fixes in patches for migration
2014-06-04 17:48:56 +05:30
Anand Doshi
c280d0655c
Set Employee Name if missing
2014-06-04 17:48:56 +05:30
Anand Doshi
cdc1b640d9
Fixes in user permissions patches
2014-06-04 17:48:56 +05:30
Anand Doshi
4985691617
Role and User Permissions
2014-06-04 17:48:54 +05:30
Anand Doshi
69eec9e344
Role and User Permissions
2014-06-04 17:48:54 +05:30
Anand Doshi
a8ce570635
Permission relogication continued
2014-06-04 17:48:53 +05:30
Anand Doshi
fab0904af7
Started permission relogication
2014-06-04 17:48:52 +05:30
Nabin Hait
fb988ba834
Salary Slip: pull details from salary struture. fixes #1719
2014-05-30 15:53:20 +05:30
Nabin Hait
1897e75894
Remove blank lines from uploaded file of attendance #1714
2014-05-30 14:31:10 +05:30
Rushabh Mehta
a39cae9c2e
added title field to support ticket, lead and employee
2014-05-21 17:34:22 +05:30
Nabin Hait
2e0620e370
Server side onload functionality in multiple docs
2014-05-19 18:15:58 +05:30
Nabin Hait
ad68d64d93
Leave approver select options in leave application and employee
2014-05-16 19:56:43 +05:30
Nabin Hait
bc7659ab90
Employee leave balance report fixes #1647
2014-05-15 11:37:12 +05:30
Anand Doshi
54b7962eb9
Pass frm to open_mapped_doc
2014-05-14 17:38:45 +05:30
Nabin Hait
aade34b0c9
Reports and print formats modified for renamed fields
2014-05-13 16:12:37 +05:30
Rushabh Mehta
409c8e9732
removed confirmation date validations (wtf)
2014-05-11 10:01:16 +05:30
Rushabh Mehta
75e11a7270
Merge pull request #1616 from pdvyas/migrate-3to4
...
3 to 4 migration fixes
2014-05-10 22:19:07 +05:30
Pratik Vyas
95f558e7bc
fix update user properties patch
2014-05-10 22:16:39 +05:30
Anand Doshi
78e9c6ef70
Deprecate Select fields with options as link:
2014-05-09 13:36:13 +05:30
Anand Doshi
f410bd9bf9
Better default permissions, ignore_restrictions for defaults, removed field trash_reason
...
Additions:
Account --> Material User: Read
Cost Center --> Sales User, Purchase User: Read
Mode of Payment --> Accounts User: Read
Supplier --> Material User, Accounts User: Read
Employee --> Employee: Restricted Read
Leave Type --> Employee: Read
Production Order --> Material User: Read
Sales Order --> Material User: Read
Print Heading --> All: Read
Terms and Conditions --> Purchase User, Material User: Read
Territory --> Material User, Maintenance User: Read
Item --> Sales User, Purchase User, Maintenance User, Accounts User: Read
Price List --> Manufacturing User: Read
Purchase Receipt --> Accounts User: Read
Warehouse --> Manufacturing User: Read
2014-05-07 17:20:42 +05:30
Anand Doshi
8c2dbab878
Changed default naming series options
...
C-Form: C-FORM-.#####
Purchase Invoice: PINV-.#####
Sales Invoice: SINV-.#####
Purchase Order: PO-.#####
Quality Inspection: QI-.#####
Supplier: SUPP-.#####
Supplier Quotation: SQTN-.#####
Attendance: ATT-.#####
Production Order: PRO-.#####
Installation Note: IN-.#####
Lead: LEAD-.#####
Opportunity: OPTY-.#####
Quotation: QTN-.#####
Sales Order: SO-.#####
Delivery Note: DN-.#####
Item: ITEM-.#####
Material Request: MREQ-.#####
Packing Slip: PS-.#####
Purchase Receipt: PREC-.#####
Stock Entry: STE-.#####
Customer Issue: CI-.#####
Support Ticket: SUP-.#####
Customer: CUST-.#####
Journal Voucher: JV-.#####
2014-05-06 19:43:11 +05:30
Anand Doshi
37909b292f
Remove India specific fields
2014-05-06 16:15:56 +05:30
Nabin Hait
02d37bbb5a
Allow Rename option added in multiple docs. Fixes #1521
2014-05-06 12:18:50 +05:30
Anand Doshi
648062d071
Fixes in test cases
2014-05-05 16:46:38 +05:30
Anand Doshi
b71a18cd1e
Leave Allocation Tool and Employee. Fixes #1555
2014-05-02 16:23:51 +05:30
Anand Doshi
f29bcaf436
Added new fixtures ( Fixes #1540 ). Removed Employee Grade from HR.
2014-05-02 13:55:07 +05:30
Anand Doshi
51e6d2228d
Salary Slip - read permission for Employee. Fixes #1553
2014-05-01 16:28:13 +05:30
Anand Doshi
d9f0f27cd4
Fixes in test cases
2014-04-30 22:16:25 +05:30
Rushabh Mehta
a15164750d
started client side testing using selenium and other related and unrelated fixes
2014-04-30 19:39:13 +05:30
Anand Doshi
69aa8ffac4
Fixed as_dict of employee.py
2014-04-28 16:51:34 +05:30
Anand Doshi
1872312cc6
Deprecated client side mapper: frappe.model.map. Fixes #1530
2014-04-25 18:38:08 +05:30
Anand Doshi
8bde7f9b3a
Conditionally toggle Naming Series. Fixes #1526
2014-04-24 18:11:49 +05:30
Anand Doshi
3e41fd1fd3
List route for tree browser based doctypes; Fixes to add child in tree browsers
2014-04-22 18:55:21 +05:30
Anand Doshi
07339fc69e
Fixes in Setup Wizard and Attachments
2014-04-22 15:30:24 +05:30
Anand Doshi
424c033395
Removed controller.py
2014-04-21 15:06:56 +05:30
Anand Doshi
cbbf451974
Fixes throw
2014-04-21 11:33:49 +05:30
Rushabh Mehta
c38fc713c6
updated translations
2014-04-16 17:46:30 +05:30
Nabin Hait
450d9d72d7
Minor fix in monthly attendance report
...
Cherry-picked and modified by @anandpdoshi
Conflicts:
hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
2014-04-16 15:23:09 +05:30
Rushabh Mehta
ff93802d58
more message fixes
2014-04-15 18:40:31 +05:30
Rushabh Mehta
8a40c136ce
more message fixing
2014-04-15 16:31:20 +05:30
Pratik Vyas
f37d6fe32b
Merge pull request #1514 from frappe/js-translate-refactor
...
JS translation refactor
2014-04-15 11:44:16 +05:30
Rushabh Mehta
354b32177d
fix for leave application test
2014-04-14 22:23:41 +05:30
Rushabh Mehta
9f0d625300
update translation strings #1403
2014-04-14 19:20:45 +05:30
Pratik Vyas
b0f279a34e
js translations refactor
2014-04-14 17:14:23 +05:30
Pratik Vyas
b52618c142
frappe._ to __
2014-04-14 16:25:30 +05:30
Rushabh Mehta
558a9aabfb
removed control panel
2014-04-04 12:00:36 +05:30
Rushabh Mehta
0cf531c8a6
frappe/frappe#478 fixes
2014-04-03 17:43:06 +05:30
Rushabh Mehta
f14b809ab5
frappe/frappe#478 , more changes, removed bean
2014-04-03 14:30:42 +05:30
Rushabh Mehta
f191f854cd
frappe/frappe#478 erpnext install works
2014-04-02 18:09:34 +05:30
Rushabh Mehta
f2227d033c
frappe/frappe#478 , removed instances of .fields
2014-03-31 23:37:40 +05:30
Rushabh Mehta
231f6a5b58
frappe/frappe#478 added test_records.json
2014-03-31 23:05:12 +05:30
Rushabh Mehta
0a0f2495a2
frappe/frappe#478 , frappe tests pass, .txt renamed to .json
2014-03-31 17:27:06 +05:30
Nabin Hait
0e13cd5ac9
frappe/frappe#478
2014-03-28 17:01:32 +05:30
Nabin Hait
0d8d30e1cc
frappe/frappe#478
2014-03-28 16:57:21 +05:30
Rushabh Mehta
b385ecf65e
frappe/frappe#478
2014-03-28 16:54:45 +05:30
Anand Doshi
43405203b2
frappe/frappe#478
2014-03-28 16:43:50 +05:30
Anand Doshi
81ba0b29da
frappe/frappe#478
2014-03-28 15:23:26 +05:30
Anand Doshi
f78d1aee28
Replaced doc, doc.fields frappe/frappe#478
2014-03-28 13:55:00 +05:30
Anand Doshi
40534f076b
Changed creation, modified format frappe/frappe#478
2014-03-28 12:46:53 +05:30
Rushabh Mehta
daae743608
frappe/frappe#478
2014-03-27 17:54:18 +05:30
Rushabh Mehta
e88bc8b12a
frappe/frappe#478
2014-03-27 17:51:41 +05:30
Rushabh Mehta
d2b34dc30c
frappe/frappe#478
2014-03-27 16:12:56 +05:30
Rushabh Mehta
66d52b55c0
#478
2014-03-27 14:17:33 +05:30
Rushabh Mehta
aa355af2cf
refactored client side Model and Meta - frappe/frappe#478
2014-03-26 18:24:30 +05:30
Anand Doshi
754cbd4036
Fixed Permissions and Time Log
2014-03-25 20:09:12 +05:30
Nabin Hait
102842ba79
Leave allocation fix
2014-03-21 11:26:08 +05:30
Nabin Hait
73083dc960
Fix related to user_default
2014-03-21 11:26:08 +05:30
Nabin Hait
4d713ac5ba
sql injection fixes
2014-03-21 11:22:37 +05:30
Pratik Vyas
65e8676f8b
Profile -> User
2014-03-13 03:09:15 +05:30
Pratik Vyas
5c81f9c44e
check docstatus before updating employee
2014-03-13 02:35:23 +05:30
Rushabh Mehta
7c932003ed
rename Profile to User frappe/frappe#470
2014-03-11 16:15:59 +05:30
Anand Doshi
09a9f4c0c9
Added module to Report doctype
2014-03-07 17:20:22 +05:30
Rushabh Mehta
c12ccdb6ea
bugfix erpnext/frappe#1446
2014-03-06 15:45:45 +05:30
Anand Doshi
2d5727b17b
Ignore mandatory during email pulling
2014-03-05 19:24:07 +05:30
Anand Doshi
f5794f1c07
Module Home Pages using Module View
2014-03-03 15:06:34 +05:30
Anand Doshi
e9baaa68e7
Changed frappe.conn to frappe.db
2014-02-26 12:35:33 +05:30
Nabin Hait
9d1f077922
get lead details in quotation
2014-02-19 17:43:24 +05:30
Rushabh Mehta
793ba6bd37
-webnotes +frappe 💥
2014-02-14 15:47:51 +05:30
Anand Doshi
1d7e933590
Fix in Get Job Applications
2014-02-07 20:26:56 +05:30
Akhilesh Darjee
f1c3537924
webnotes/erpnext#869 newsletter to send to employees
2014-02-03 19:28:36 +05:30
Nabin Hait
45f0c25a6d
Merge pull request #1365 from akhileshdarjee/4.0-hotfix
...
Stay Updated button in website fixed
2014-01-31 02:44:35 -08:00
Akhilesh Darjee
dc45153430
webnotes/erpnext#1221 dont allow duplicate user id in employee
2014-01-31 12:23:13 +05:30
Akhilesh Darjee
4f7215662d
webnotes/erpnext#1090 set default tax type in customer and supplier
2014-01-29 16:31:38 +05:30
Akhilesh Darjee
86894f3bbf
merge conflict fixed
2014-01-27 15:42:02 +05:30
Rushabh Mehta
1cd96a136f
updates for restriction
2014-01-24 11:10:24 +05:30
Rushabh Mehta
f96bcf943b
added explicit delete perimssions
2014-01-20 17:52:13 +05:30
Nabin Hait
dc15b4fa8a
Fixed conflict while merging with develop brnach
2014-01-20 16:48:49 +05:30
Akhilesh Darjee
5c96b75a68
fixed maintenance schedule
2014-01-02 17:54:12 +05:30
Nabin Hait
a2e0a9b05f
Fliend rearrangemet in tables
2014-01-01 10:45:42 +05:30
Anand Doshi
8e332ffd16
Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions
...
Conflicts:
erpnext/accounts/page/accounts_browser/accounts_browser.css
erpnext/controllers/buying_controller.py
erpnext/manufacturing/doctype/production_order/production_order.py
erpnext/patches/patch_list.py
erpnext/selling/doctype/customer/customer.txt
erpnext/selling/doctype/sales_order/sales_order.py
erpnext/selling/doctype/sales_order/test_sales_order.py
erpnext/setup/doctype/features_setup/features_setup.txt
erpnext/stock/doctype/stock_entry/test_stock_entry.py
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
startup/query_handlers.py
2013-12-26 19:12:51 +05:30
Rushabh Mehta
54047780fc
Merge with 3.3.8
2013-12-26 11:07:46 +05:30
Rushabh Mehta
2b08985e16
Translations redesigned webnotes/wnframework#351
2013-12-19 18:27:48 +05:30
Rushabh Mehta
c652a6254f
Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351
2013-12-16 12:48:38 +05:30
Rushabh Mehta
6de403f2be
added manifest, hooks and fixed requires webnotes/wnframework#351
2013-12-13 14:10:14 +05:30
Rushabh Mehta
1f84799f2d
install, web serving, session booting webnotes/wnframework#351
2013-12-12 19:12:19 +05:30
Rushabh Mehta
39bb8e2ed4
step 0: install
2013-12-11 15:32:14 +05:30
Rushabh Mehta
afea58b7a1
moved modules inside erpnext folder
2013-12-11 10:43:52 +05:30
Rushabh Mehta
2fa2f7178d
moved directory structure
2012-09-24 19:13:42 +05:30
Anand Doshi
d14dc83b88
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-12 14:55:20 +05:30
Anand Doshi
94dd7ef879
show employee name in employee link field in attendance form
2012-09-12 14:53:44 +05:30
Anand Doshi
0851b4b397
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-14 14:56:09 +05:30
Anand Doshi
46f8b50c8c
added Expense Claim Type link in HR Home page
2012-08-14 14:53:38 +05:30
Anand Doshi
59d37c4bcb
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/hr/doctype/expense_claim/expense_claim.js
erpnext/patches/patch_list.py
2012-07-31 17:30:49 +05:30
Anand Doshi
0029ac9f3c
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-31 11:46:57 +05:30
Anand Doshi
054cf3907f
removed validate approver code
2012-07-31 11:46:41 +05:30
Nabin Hait
87b6d656df
sanctioned amt auto set equals to claimed amt
2012-07-31 11:23:44 +05:30
Anand Doshi
76ec66dd65
fixes for unicode
2012-07-20 18:11:30 +05:30
Anand Doshi
486f9dfcec
added unicode_literals import at start of each file
2012-07-19 13:40:31 +05:30
Anand Doshi
5756630efb
Merge branch 'master' of github.com:webnotes/erpnext into dev
...
Conflicts:
erpnext/stock/doctype/delivery_note/delivery_note.py
public/js/all-app.js
2012-07-18 20:31:37 +05:30
Anand Doshi
249659d673
Changed file names from listview.js to doctype_name_list.js
2012-07-18 20:25:58 +05:30
Rushabh Mehta
2eef40bf1e
get_field > wn.meta.get_docfield
2012-07-16 14:16:57 +05:30
Nabin Hait
51f8a6d0d5
select employee based on joining and relieving date in salary maanger
2012-07-12 16:25:13 +05:30
Nabin Hait
e9c19369a9
salary slip will not submitted through salary manager if Send email checked and invalid email id
2012-07-12 10:33:45 +05:30
Nabin Hait
42e1273c4c
listview for salary structure
2012-07-11 16:38:00 +05:30
Anand Doshi
e301e8a6c1
Merge branch 'master' into dev
...
Conflicts:
erpnext/buying/doctype/quality_inspection/quality_inspection.py
2012-06-28 18:40:57 +05:30
Anand Doshi
cbf181c390
employee list -- show status
2012-06-28 18:38:38 +05:30
Anand Doshi
8ae5ba9abf
fixes related to --> clear locals and then sync locals when whole doclist is passed
2012-06-25 20:05:35 +05:30
Rushabh Mehta
4c56275d26
appframe is now heading
2012-06-14 11:05:09 +05:30
Nabin Hait
e4f2c7b213
series issue in attendance template
2012-06-04 11:48:50 +05:30
Nabin Hait
86375f089a
Merge branch 'shf_rename'
...
Conflicts:
erpnext/patches/patch_list.py
2012-05-21 15:48:21 +05:30
Nabin Hait
fec3f783af
custom field included in docfield query
2012-05-21 14:40:25 +05:30
Anand Doshi
1aae261490
delete button in doclistview
2012-05-21 14:31:03 +05:30
Anand Doshi
00175612ac
Merge branch 'shf_rename'
...
Conflicts:
erpnext/stock/doctype/item/listview.js
2012-05-18 16:50:35 +05:30
Anand Doshi
d49da9bff1
new listviews
2012-05-18 16:49:36 +05:30
Anand Doshi
d643d367ca
Merge branch 'shf_rename'
...
Conflicts:
public/js/all-app.js
public/js/all-web.js
2012-05-18 11:52:31 +05:30
Nabin Hait
7638833b75
salary register issue fixed
2012-05-17 17:47:26 +05:30
Nabin Hait
76d69b1000
salary register issue fixed
2012-05-17 17:10:15 +05:30
Rushabh Mehta
deeae62b18
merge js/css
2012-05-14 15:03:17 +05:30
Rushabh Mehta
0eb790a0ae
cleaned up imports, doc
2012-05-11 15:53:37 +05:30
Nabin Hait
bd3d3ca1eb
error fixed in sending mail on submitting of sal slip
2012-05-11 13:36:17 +05:30
Nabin Hait
926f46f04a
Fixed conflict while merging with master
2012-05-01 11:51:08 +05:30
Nabin Hait
d58da50f50
Merge branch 'master' of github.com:webnotes/erpnext
2012-05-01 11:37:45 +05:30
Nabin Hait
41cc32790f
Fixed issie in auto notification
2012-04-30 14:36:18 +05:30
Anand Doshi
f642168a26
hr home: changed Allocate Leaves --> Leave Allocation Tool
2012-04-18 18:35:30 +05:30
Anand Doshi
24e18569d9
fixes in install docs for roles
2012-04-17 11:45:35 +05:30
Anand Doshi
45a4edc9c9
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
...
Conflicts:
css/all-app.css
version.num
2012-04-17 11:19:15 +05:30
Nabin Hait
eaf8b91402
hr reports cleanup
2012-04-16 12:31:36 +05:30
Nabin Hait
dbffc2d8d0
fixed hr issues
2012-04-16 12:22:47 +05:30
Rushabh Mehta
f1264a7f76
listing, module pages in appframe
2012-04-13 11:41:43 +05:30
Anand Doshi
09e8c4cd2d
further fixes
2012-04-12 17:51:53 +05:30
Anand Doshi
25bc68c7b2
fix in field names
2012-04-12 14:08:43 +05:30
Anand Doshi
2424387651
fixes after sync testing
2012-04-10 19:14:37 +05:30
Anand Doshi
7e0479bc4c
cleanup of search criteria
2012-04-05 18:27:56 +05:30
Anand Doshi
fa0cd89a7c
change from labels to fieldname in cur_frm.cscript
2012-04-05 13:03:35 +05:30
Anand Doshi
5112b5b6b8
rerun of rename_dt
2012-04-02 19:12:29 +05:30
Anand Doshi
c88ae2be4d
rename dt second cut
2012-03-30 18:18:36 +05:30
Anand Doshi
fedfd89e4a
rename dt first cut
2012-03-30 12:29:06 +05:30
Anand Doshi
a30fbd004e
merge of sync handler and sync_file_db - first cut
2012-03-27 19:31:38 +05:30
Anand Doshi
5f9501d4d8
Merge branch 'sync_file_db' into shf_merge
...
Conflicts:
erpnext/projects/doctype/project/project.txt
2012-03-23 14:51:35 +05:30
Nabin Hait
0ad2ef2111
sync with respect to file
2012-03-21 15:02:39 +05:30
Nabin Hait
e8da15cb5b
sync ref file
2012-03-21 12:45:14 +05:30
Rushabh Mehta
15da133de9
removed
2012-03-06 18:41:11 +05:30
Anand Doshi
6b69b4f6a4
Merge branch 'master' into navupdate
2012-02-28 13:51:29 +05:30
Anand Doshi
fc60335620
fix in leave application query
2012-02-28 13:51:04 +05:30
Rushabh Mehta
3966f1dc5d
added license files
2012-02-23 12:35:32 +05:30
Rushabh Mehta
35fabf76a6
updated module pages
2012-02-21 19:03:50 +05:30
Rushabh Mehta
d025133b39
added module pages and other css updates
2012-02-21 17:26:50 +05:30
Anand Doshi
e00e70841c
Merge branch 'stable' into latest
...
Conflicts:
erpnext/accounts/doctype/journal_voucher/journal_voucher.js
erpnext/accounts/doctype/payable_voucher/payable_voucher.js
index.html
version.num
2012-02-07 10:58:45 +05:30
Anand Doshi
d008964fd6
Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues
2012-02-07 10:48:11 +05:30
Rushabh Mehta
c5bf642c7d
version
2012-01-23 16:18:34 +05:30
Anand Doshi
5e57a39bb1
Merge branch 'master' into stable
2012-01-04 19:32:01 +05:30
Anand Doshi
f80f20f480
Changes in Notifications
2012-01-04 19:31:32 +05:30
Anand Doshi
6ac1d4bb44
Merge branch 'stable' of github.com:webnotes/erpnext into stable
...
Conflicts:
erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
2012-01-03 11:45:11 +05:30
Nabin Hait
a57732f71d
Removed custom field from doctype
2011-12-20 18:48:19 +05:30
Nabin Hait
c67e0d85d3
Employemnt Type filter removed from salary manager
2011-11-07 10:48:51 +05:30
Rushabh Mehta
ae00547592
appriasal copy fix
2011-11-04 10:43:11 +05:30
Rushabh Mehta
36fc1d06fb
appriasal copy fix
2011-11-04 10:41:12 +05:30
Anand Doshi
25190a903c
Report to get Employeewise Balance Leave
2011-10-31 16:47:48 +05:30
Nabin Hait
db3728955b
error fixed in leave calculation
2011-10-11 17:11:24 +05:30
Nabin Hait
685564f71d
Resolved conflict after merging with master
2011-10-11 14:42:34 +05:30
Nabin Hait
e8475f9b85
Appraisal score allowed to be fraction
2011-09-22 11:00:53 +05:30
Nabin Hait
d984872be9
checked sal struc docstatus in validation
2011-09-16 14:47:19 +05:30
Nabin Hait
73c4a4a154
removed make_feed() function
2011-09-16 11:24:54 +05:30
Rushabh Mehta
53ba83158c
fixes to startup
2011-09-15 15:06:23 +05:30
Rushabh Mehta
66ac2b018a
first cut for lazy loading framework
2011-09-05 18:43:09 +05:30
