Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,906 Commits 3 Branches 0 Tags 1 GiB
9f4b270116
Commit Graph

1665 Commits

Author SHA1 Message Date
Frappe Bot
fdd5d54d41 Merge branch 'staging' into develop 2019-01-05 09:11:15 +00:00
Sahil Khan
3ac57c756b fix: remove print statement from test case 2019-01-04 12:57:34 +05:30
Anurag Mishra
bb6a7eb9d3 refractor 2019-01-04 12:32:51 +05:30
Anurag Mishra
add6bf35a3 Fix: Employee Onboarding/Seperation task Assignment 2019-01-04 11:36:30 +05:30
Rohit Waghchaure
8bac5b6e73 [minor] Employee is reqd to preview salary slip from salary structure 2019-01-03 16:20:35 +05:30
Sagar Vora
c14c7c84e3 fix: leave application and timesheet tests 2019-01-02 21:28:11 +05:30
Rohit Waghchaure
c186f153ff Added test cases 2019-01-01 15:03:56 +05:30
sahil28297
50f0a99330 fix: Checks for status in employee and for date range in upload attendance. (#16279) 
* fix: checks for status in employee and for date range in upload attendance.

1. Earlier the status of an amployee can be set to 'Left' even though other employees are reporting to this employee, added checks to prevent this behaviour.
2. Earlier the range of dates added to the template were not checked for date of joining and relieving date. Now the range of dates added in the template are between the date of joining and relieving date.

* remove "import erpnext"

* fix: replace frappe.db.sql with frappe.db.get_all

* fix: refactored using list comprehension

* fix: query refactoring

* fix: combining list comprehensions

* travis debugging

* fix: doc.save
 2018-12-28 17:15:56 +05:30
Suraj Shetty
3de12db2b1 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-27 09:05:25 +05:30
Frappe Bot
9e09b3adbe Merge branch 'staging' into develop 2018-12-26 12:16:20 +00:00
Frappe Bot
e8c2fdfb8c Merge branch 'master' into staging-fixes 2018-12-26 11:44:09 +00:00
rohitwaghchaure
53a38e8edc
Merge pull request #16257 from surajshetty3416/permission-fixes 
Fix user permission checks
 2018-12-26 14:49:01 +05:30
rohitwaghchaure
deb96dab3e [Fix] Salary structure not saving (#16275) 2018-12-25 13:58:20 +05:30
Suraj Shetty
146be9f6a6 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-24 16:08:43 +05:30
Navdeep Ghai
c4d38c0afc Fix the disappears of image bug after uploading and saving the employee (#16217) 
* Fix image disappears of image after uploading and saving the employee

* Fix the codacy issue
 2018-12-24 14:53:19 +05:30
Suraj Shetty
b2965001d1 Replace 'Make' with 'Create' 2018-12-23 13:25:58 +05:30
Frappe Bot
1b7c583c48 Merge branch 'staging' into develop 2018-12-21 05:46:23 +00:00
Suraj Shetty
7ae2d59ffd
Merge branch 'staging-fixes' into permission-fixes 2018-12-18 15:41:03 +05:30
shreyashah115@gmail.com
0543f03b58 fix: Remove date_of_joining from field list 2018-12-17 15:02:30 +05:30
Zlash65
c8337c6d83 fix check for leave on holiday for half day 2018-12-15 21:15:45 +05:30
Saurabh
e165fc0e1b Merge branch 'staging' into develop 2018-12-13 10:45:32 +05:30
Rushabh Mehta
eeab3ee5d3
fix(test): use frappe.db.rollback to revert deletion of fixture data (#16192) 
* debug(test): test_payroll_entry

* debug(test): test_payroll_entry

* debug(test): use frappe.db.rollback to undelete fixture data
 2018-12-11 22:37:29 +05:30
Suraj Shetty
07e5786e1b Fix user permission checks 2018-12-10 19:10:18 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop 2018-11-28 08:28:37 +00:00
Nabin Hait
dde952d591
Merge pull request #16092 from deepeshgarg007/salary_slip 
Salary slip earnings and deductions table bug fix
 2018-11-27 11:39:10 +05:30
Nabin Hait
9a06543453
Merge branch 'staging-fixes' into indicators-in-leave-applications 2018-11-27 11:38:29 +05:30
Kanchan Chauhan
2d0b788105 [Minor] Indicators in Leave Application 2018-11-27 10:37:23 +05:30
Nabin Hait
36f266355d
Merge branch 'staging-fixes' into fixed_holiday_list_not_working 2018-11-26 19:44:11 +05:30
deepeshgarg007
bd87903b56 Added condition for default amount 2018-11-26 17:13:59 +05:30
deepeshgarg007
533066eb87 Salary slip bug fix 2018-11-26 15:04:21 +05:30
Nabin Hait
48e0e19b03 fix(test): Fixed salary slip and sales analytics test cases 2018-11-26 11:05:28 +05:30
Rohit Waghchaure
037a151ef5 [Fix] New holiday list form is not working 2018-11-22 12:57:34 +05:30
Frappe Bot
eb4969d24f Merge branch 'staging' into develop 2018-11-15 09:26:03 +00:00
Frappe Bot
98b4a1bc81 Merge branch 'master' into staging-fixes 2018-11-15 09:12:04 +00:00
Frappe Bot
98a2348779 Merge branch 'staging' into develop 2018-11-14 11:33:08 +00:00
Rohit Waghchaure
047a7123eb Claimed amount is not reset on cancel 2018-11-14 13:20:00 +05:30
alsum
e04a753d53 assign-sa-to-group-of-employees 2018-11-13 11:43:58 +02:00
TaiLouis
c856794519 fix(hr): Delete salary slip when cancel payroll entry (#15757) 2018-11-08 13:06:24 +05:30
Ameya Shenoy
8075a576f9
Merge branch 'staging' into develop 2018-11-05 06:53:27 +00:00
Ameya Shenoy
4a75d58d89
Merge branch 'master' into staging-fixes 2018-11-05 06:45:04 +00:00
Rohit Waghchaure
598d34445f [Fix] Column ‘claimed_amount’ cannot be null 2018-11-02 16:02:33 +05:30
Ameya Shenoy
f3f997f232
Merge branch 'staging' into develop 2018-10-31 13:51:52 +00:00
deepeshgarg007
78b273af43 [Bug-Fix] Cannot Save Bank Statement Transaction Entry (#15793) 
* Create bank settings only if bank name is available

* Minor bug-fix in validate_overlap
 2018-10-31 18:12:03 +05:30
Ameya Shenoy
df62296a26
Merge branch 'staging' into develop 2018-10-30 12:54:16 +00:00
ashish-greycube
4d47c63db1
Update employee_advance.py 
https://github.com/frappe/erpnext/issues/13694
Cancel of  already paid "Expense Claim" gives error IntegrityError: (1048, u"Column 'claimed_amount' cannot be null")
Sol: claimed_amount should be flt
 2018-10-24 16:35:31 +05:30
Ameya Shenoy
7658bdc00a
Merge branch 'staging' into develop 2018-10-23 08:06:15 +00:00
Shreya
1b105e2575 Add test case 2018-10-23 11:45:57 +05:30
Shreya
60d8a0da1e fix(leave-status): Do not consider current leave application while submitting 2018-10-23 11:45:57 +05:30
Ameya Shenoy
606c504f28
Merge branch 'staging' into develop 2018-10-15 12:25:03 +00:00
Nabin Hait
3c29967d27 Fixed merge conflict 2018-10-15 15:43:21 +05:30
rohitwaghchaure
94fcb0e9f9 [Enhance] Add user image in the employee from the user (#15680) 2018-10-15 14:57:46 +05:30
rohitwaghchaure
3362d6b948 [Fix] Precision issue in the expense claim (#15678) 2018-10-15 11:07:13 +05:30
Mangesh-Khairnar
8c62ab4af0 [Enhancement] Email birthday reminder (#15559) 
* Update hooks.py

* modified date for reload_doc (#15027)

* Single email for multiple birthdays and test
 2018-10-11 17:06:10 +05:30
Charles-Henri Decultot
50447b195d Compatibility with Py2 (#15653) 2018-10-11 16:48:38 +05:30
Ameya Shenoy
f90af80344
Merge branch 'staging' into develop 2018-10-11 06:58:53 +00:00
Sagar Vora
d92f3ac480 Fix 'transporter info' section in Delivery Note (#15565) 
- create is_transporter checkbox in supplier doctype
- new field transporter (supplier with is_transporter checked)
- created fields driver and driver_name
- removed GST India fields from core doctype
- removed readonly & allow_on_submit from fields (delivery trip applicable only for in-house delivery)
- read_only transporter_name field (kept for backwards compatibility)
- made necessary changes in delivery_trip implementation
- hidden section's fields from print (preserving v10 convention)
- added transporter field to 'Driver' doctype
- added queries for transporter and driver fields
- GST India fields in regional module
- Fix e-waybill report
 2018-10-10 14:51:26 +05:30
Ameya Shenoy
da10f6ebd8
Merge branch 'staging' into develop 2018-10-04 11:51:30 +00:00
Ameya Shenoy
7d929c508f
Merge branch 'master' into staging-fixes 2018-10-04 09:25:07 +00:00
Charles-Henri Decultot
efd776da46 Events in timeline (#15485) 
* Events in timeline

* Namespace correction

* Codacy correction

* Addition of sales partners in participants

* Correct json indent
 2018-10-03 10:41:26 +05:30
Sharath C
c0b684dc30 Attendance - Unique check based on Employee and Date excluding cancelled docs (#15556) 2018-10-03 10:40:22 +05:30
rohitwaghchaure
8976ad5ca1
Merge pull request #15523 from rohitwaghchaure/fix_attendance_tool_issue 
[Fix] Attendance tool
 2018-10-01 15:07:49 +05:30
Rohit Waghchaure
c7f8b82fff [Fix] Attendance tool 2018-10-01 12:30:58 +05:30
Rohit Waghchaure
8fbf856618 [Fix] Salary slip 2018-10-01 12:00:45 +05:30
Nabin Hait
1e7c32b909
Payroll fixes and more (#15475) 
* fix(payroll): multiple minor fixes related to salary structure

* Added GSTR-1 and GSTR-2 report in Accounts module page

* delete asset movement records on cancellation of Purchase Receipt

* Update consolidated_financial_statement.py

* minor fix

* minor fix

* add filters on item prices report (#15495)
 2018-09-26 18:01:00 +05:30
Mohamed_Alsum
b9228fa443 show only submitted salary_structure and leave_policy in Employee Grade app (#15434) 
* update staff plan when add or delete job-opening

* Update job_opening.py

* filter default_salary_structure and default_leave_policy

* merge
 2018-09-25 18:56:17 +05:30
Suraj Shetty
bfc195dd8b Changes to support refactor in frappe pg-poc branch (#15287) 
* Remove quotes from sql to make it compatible with postgres as well

* Fix queries
- Replace mysql specifc queries with standard ones

* Make repo URL chages to test pg-poc

* Add root passowrd to test site config

* Fix quotes issue

* Remove debug flag from a pricing rule query

* Remove python 3.6 version from travis.yml

* Fix improper query issue

* Fix incorrect query

* Fix a query

- This fix need to be changed when we will  start supporting postgres
since date_format is not supported by postgres

* Get price list map as dict

* Convert price_list_currency_map to dict
 2018-09-21 10:20:52 +05:30
Saurabh
75d90b9d8f a[resolved] merge-conflicts 2018-09-20 13:28:23 +05:30
Saif
772dc6e82c Various permission fixes (#15448) 
* Removed test letter head from Consolidated Financial Statement

* Removed incorrect role permissions
 2018-09-20 13:20:17 +05:30
rohitwaghchaure
a60ab1af75 [Fix] Salary slip is not saving (#15449) 2018-09-20 13:18:49 +05:30
Saurabh
393dd4286a [resolved] merge-conflicts 2018-09-12 14:48:30 +05:30
Ahmed Madi
20d8c52d2a Update salary_slip.js (#15200) 2018-09-12 11:02:57 +05:30
Rushabh Mehta
a2288ff8e7 fix(assessment_result): student must be in group (#15255) 
* fix(assessment_result): student must be in group

* fix(test_student_group): raise correct exception

* fix(unused-import): assessment-plan.py

* fix(tests)

* fix(tests)

* fix(test)

* fix(tests)
 2018-08-31 16:12:49 +05:30
Shreya Shah
ee8f8281b4 [py3] Convert filter object to list (#15260) 2018-08-30 19:22:22 +05:30
Charles-Henri Decultot
7e86d7b014 Add default payable account for expense claims (#15246) 2018-08-30 19:18:26 +05:30
Nabin Hait
f6b784e39e Test fixes 2018-08-30 18:42:35 +05:30
Shreya Shah
68348d4130 [Attendance-Tool] Filter employees based on date of joining (#15262) 2018-08-30 17:25:58 +05:30
Rushabh Mehta
20fd2ddd1c ux(hr): module listing and quick entry for employee 2018-08-30 09:21:54 +05:30
Rushabh Mehta
13bcc4e27e perms: fix default import, export perms 2018-08-29 17:10:27 +05:30
Aditya Hase
e3ac5ff9e3 erpnext: refactor async to is_async (#15231) 2018-08-28 14:11:58 +05:30
Nabin Hait
01b2a6549c minor fix 2018-08-28 14:09:36 +05:30
Shreya Shah
a5add289bb Refactor Naming Series (#15070) 
* Patch to create Property Setter for existing naming series

* Update existing naming series options with new

* Add patch link to patches.txt

* Update patch

* Fix codacy

* Fix as per suggestions

* Remove old patch for property setter

* Improve as per suggested

- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname

* Fix Travis

* Rebase with develop
 2018-08-28 13:44:48 +05:30
Nabin Hait
c95153f83b Offer date mandatory in job offer 2018-08-20 16:58:06 +05:30
Rushabh Mehta
8705371ef0 fix(product-listing): fix variant selection in website 2018-08-16 09:22:45 +05:30
Faris Ansari
4809f86035 fix(report): field -> fieldname, dateutil -> frappe.datetime (#15106) 2018-08-14 10:56:18 +05:30
Zarrar
a4d06fc881
replace cur_frm with frm 2018-08-12 17:48:04 +05:30
ahmad zaqout
7df03a4b5b
replace department group to department 2018-08-11 22:10:24 +03:00
ahmad zaqout
0fd562e0d9
replace customer to department 2018-08-11 21:54:56 +03:00
Saurabh
20fb443f0c [Resolved] merge conflicts 2018-08-10 17:11:30 +05:30
rohitwaghchaure
a0b846fb88 [Minor] Added condition for get_bank_cash_account (#15112) 2018-08-09 15:51:38 +05:30
rohitwaghchaure
59de1dae6a [Fix] Math domain error (#15107) 2018-08-09 10:58:37 +05:30
Rushabh Mehta
708e47aadf optimize(various) 2018-08-08 16:37:31 +05:30
ahmad zaqout
63a741e5c8 fix throw_overlap_error in Shift Assignment (#15103) 
fix throw_overlap_error in Shift Assignment
 2018-08-08 10:36:40 +05:30
Saurabh
824b388631 Resolved merge conflicts 2018-08-07 13:01:11 +05:30
Faris Ansari
796ca56f85 Use frappe.utils.md_to_html instead of manual import (#15087) 2018-08-07 11:53:36 +05:30
rohitwaghchaure
0452b405f4 [Fix] Not able to submit the expense claim (#15057) 2018-08-01 17:45:51 +05:30
Nabin Hait
14ad9f70b5 Patch fixes 2018-07-31 17:33:14 +05:30
Nabin Hait
d53c2c031d more payroll improvements and tests fixes 2018-07-30 20:17:15 +05:30
Nabin Hait
d305a7a959 Made leave application importable 2018-07-30 17:12:32 +05:30
Nabin Hait
4f135c9805 Payroll entry ux improvements and processing via background jobs 2018-07-30 16:37:07 +05:30
Nabin Hait
04d5412754 Fixed conflict 2018-07-30 16:37:07 +05:30
Nabin Hait
9c735e43b0
Grant leaves via modal and backgroud jobs (#15026) 2018-07-30 10:58:49 +05:30
Zarrar
6004b66797 [Minor] Job Offer UX improvise (#15042) 
* job offer ux improv

* Update job_offer.js
 2018-07-30 10:57:13 +05:30
Ranjith Kurungadam
e555b5bcf2 Salary Slip tests for tax calc on benefits, additional salary (#14985) 
* tests for tax calc on benefits, additional salary

* fix tests - remove created additional salary
 2018-07-26 14:39:59 +05:30
Nabin Hait
8173d9f17a
Update additional_salary.json 2018-07-26 12:20:05 +05:30
Nabin Hait
22fa99d040 Payroll Fixes 2018-07-25 18:21:39 +05:30
Ranjith Kurungadam
1e90dafef8 fixes Benefit Application, Additional Salary (#14971) 
* fix - add Additional Salary if multiple in one slip

* fix - Benefit Appication, None comparison
 2018-07-23 11:32:58 +05:30
Ranjith Kurungadam
68abe25371 fix - assigned Salary Structure query (#14965) 2018-07-23 11:31:46 +05:30
Ranjith Kurungadam
dff2ba72d3 test TDS calculation (#14919) 
* test TDS calculation

* fix failing test cases

* fix codacy
 2018-07-19 14:34:05 +05:30
Saurabh
d7897f1c53 Resolved merge conflicts 2018-07-18 17:08:16 +05:30
Faris Ansari
9e874af9ba Query report print (#14935) 
* QueryReport

- Only print visible columns in report
- Use get_columns_for_print method instead of directly
accessing report.columns

* Query Report

- Replace frappe.query_report_filters_by_name with new API
 2018-07-18 09:28:44 +05:30
Shreya Shah
fbeab5bf73 Show opening balance of leaves (#14925) 
* Show opening balance of leaves

* Update employee_leave_balance.py
 2018-07-17 11:59:51 +05:30
KanchanChauhan
09e680b4aa [Fix] Should not get approvers for disabled Departments (#14868) 2018-07-13 12:26:56 +05:30
Zarrar
9a3b785a03 [Minor] Employee Separation Fix (#14867) 
* delete associated task & project forcefully
in Employee Seapration cancel trigger

* remove leftover print statement

* remove console statements
 2018-07-11 14:34:55 +05:30
Saurabh
db7324890f Merge branch 'master' into develop 2018-07-09 15:53:51 +05:30
Ranjith Kurungadam
ea089d67ce Employee Benefit Application - fix (#14837) 2018-07-09 14:01:18 +05:30
rohitwaghchaure
8179bcbabd [Fix] Code cleanup (#14843) 2018-07-09 09:29:40 +05:30
rohitwaghchaure
e4a53f961a [Fix] Unable to print Salary Register (#14844) 2018-07-09 09:28:56 +05:30
Ranjith Kurungadam
6429ba9ed9 Payroll Entry - fix query, get assignment by end date (#14827) 2018-07-06 13:30:40 +05:30
Saurabh
1cfcf70905 Resolved merge conflicts 2018-07-06 13:18:44 +05:30
Ranjith Kurungadam
5d134e0465 TDS Calculate tax for whole period on deduct checkboxes (#14824) 
* Tax Exemption Proof Submission - fields submission_date, exemption_amount

* Salary Detail - field tax_on_flexible_benefit, tax_on_additional_salary

* Salary Slip - save tax for benefit, additional salary in Salary Detail, recalculate tax for whole period on deduct checkboxes
 2018-07-06 11:57:32 +05:30
Rushabh Mehta
df23c7dc0c
[cleanup] bunch of UX fixes (#14787) 
* [cleanup] add dashboard to leave policy, employee form cleanup

* [test] first_name in employee

* [fix] tests

* [fix] tests

* [fix] tests

* [hr] add more dashboards

* [minor] fixes + ux
 2018-07-05 15:19:28 +05:30
Shreya Shah
430810f64c Fix typo (#14802) 2018-07-04 10:17:36 +05:30
Zarrar
68a148e293 half_day enable/disable check (#14795) 2018-07-03 17:00:38 +05:30
Nabin Hait
9911309631 Patch fixes 2018-07-03 13:06:49 +05:30
Nabin Hait
f4660d2479 Ignore calculating tds if amount/formula is mentioned in salary structure 2018-07-03 13:06:49 +05:30
Ranjith Kurungadam
273e8e59ca fix Salary Component (#14783) 2018-07-03 10:05:01 +05:30
Pawan Mehta
e734b7c17b Add filters to show Draft salary slips in salary register (#14780) 
* [fix] #14778

* replace if-elif block with inline block
 2018-07-03 10:01:19 +05:30
rohitwaghchaure
afe764264d [Fix] Employee advance issues (#14750) 2018-07-01 16:48:00 +05:30
Ranjith Kurungadam
4dc5721ba5 fix - Benefit Application query (#14767) 2018-07-01 16:44:37 +05:30
Nabin Hait
e3daaa63f0
Payroll fixes (#14758) 
* Ignore calculating tds if amount/formula is mentioned in salary structure

* [fix] Paid amount in Journal Entry from Payroll Entry

* fix codacy
 2018-07-01 16:43:34 +05:30
Ranjith
69b03a3b53 fix typo 2018-06-29 20:14:20 +05:30
Ranjith Kurungadam
fd7ef2e15c Salary Component - field display, value dependency (#14747) 2018-06-29 16:53:56 +05:30
Ranjith Kurungadam
b402ccc0b5 Payroll Entry - make only one JE, separate JE for Flexi (#14752) 2018-06-29 16:48:49 +05:30
Nabin Hait
6e86fb2540 Set user permissions for new departments based on company 2018-06-29 14:36:45 +05:30
Nabin Hait
c114ceb67d Set salary component properties in existing components and salary structures 2018-06-29 14:36:45 +05:30
Ranjith Kurungadam
a10f118ddd Payroll Entry - Validate Attendance (#14738) 2018-06-28 23:28:07 +05:30
Ranjith Kurungadam
f6e654eccc Payroll Entry - fix deduct taxes (#14730) 2018-06-28 23:04:51 +05:30
Ranjith Kurungadam
6ceed038e6 Fix benefits (#14735) 
* Employee Benefit Application - fix typo

* Employee Benefits - fix field renamed
 2018-06-28 23:02:58 +05:30
Ranjith Kurungadam
b66bde32f8 Payroll Entry - fix only one employee fetched (#14718) 2018-06-28 14:40:29 +05:30
Pawan Mehta
c7897e491d [fix] #14714 (#14715) 2018-06-28 14:13:56 +05:30
Ranjith Kurungadam
23e235395e Salary Slip - remove check query limited to one (#14699) 2018-06-27 17:29:40 +05:30
Ranjith Kurungadam
53cdbe960e Salary Slip - fix query (#14693) 2018-06-27 11:15:39 +05:30
Jamsheer
86aed90a5c [Fix] - Get payroll period days (#14686) 
* Fix - get_payroll_period_days

* Fix - get_payroll_period_days
 2018-06-27 11:13:20 +05:30
Rushabh Mehta
096b943b0c [minor] fixes to moment.defaultDateFormat and daily work summary eplies 2018-06-25 22:38:20 +05:30
Jamsheer
4f8deb92cc [Fix] - Leave Perid - Grant Allocations (#14668) 
* Leave Perid - Grant Allocations - Fix

* Codacy - string statement has no effect
 2018-06-25 14:49:54 +05:30
Shreya Shah
d8031d1a53 Clear child table before appending (#14648) 2018-06-25 10:34:55 +05:30
Ranjith Kurungadam
b4ad3c3f77 Salary Structure Assignment - remove to_date (#14642) 
* Salary Structure Assignment - remove to_date

* fix Salary Assignment - remove to_date

* Salary Slip - fix codacy remove sting based query, add end_date to condition
 2018-06-25 10:29:54 +05:30
Jamsheer
8044d09d50 [Enhance] Refactor (#14647) 
* Payroll Entry - Make Bank Entry button routes to Journal Entry list view

* Salary Component - additional component and flexi not comes in same component

* Salary Structure - refactor validation messages
 2018-06-25 10:29:06 +05:30
Jamsheer
648728f330 Fix - depends on lwp - employee benefit (#14644) 2018-06-22 17:28:29 +05:30
Jamsheer
b64161a389 Employee benefit - Last payroll period benefit (#14634) 
* Employee benefit - Last payroll period benefit

* Method name refactor
 2018-06-22 17:27:54 +05:30
Shreya Shah
5b64e98c5b Fetch company on employee selection (#14633) 2018-06-22 15:41:57 +05:30
rohitwaghchaure
d3fb0fbb20 Added test cases for asset accounting, asset value adjustment (#14572) 
* Added test cases for asset accounting, asset value adjustment

* Accounting entry for the asset created manually

* Added asset movement test cases and validation

* Added validation to make asset from purchase receupt, invoice only
 2018-06-22 15:40:59 +05:30
Ranjith Kurungadam
ce26610d39 Fix tax calculation (#14635) 
* Salary Detail - field is_additional_component

* TDS fix - exclude additional component from monthly salary, but add to annual income to calculate tax

* fix indentation
 2018-06-22 15:39:49 +05:30
Nabin Hait
3ebc15cc8f test fixes 2018-06-21 17:55:32 +05:30
Nabin Hait
e5b3a56cea Test case fixes 2018-06-21 15:21:17 +05:30
Shreya Shah
c8a40f3ef0 [Tests] Employee Onboarding & Separation (#14606) 
* Set query on department

* Add test for Employee Onboarding

* Add fetch for Employee Separation fields

* Add test for Employee Separation

* Fix Staffing Plan test case
 2018-06-21 13:06:47 +05:30
Shreya Shah
22bb61b58c
Merge pull request #14608 from shreyashah115/fix-onboard 
[Enhance] Employee Onboarding & Separation
 2018-06-21 11:51:39 +05:30
Jamsheer
f76dbbae68 Compensatory Leave Request (#14611) 
* Compensatory Leave Request - Validate Holidays and Attendance

* Compensatory Leave Request - Cancel

* Half Day in Compensatory Leave Request

* Leave allocation on Compensatory Leave Request - Fix

* Unused import
 2018-06-21 11:38:38 +05:30
Nabin Hait
227489193b Test case fixes 2018-06-21 11:36:13 +05:30
Siddhi Sawant
51e4d641c8 Job Applicant Source (#14543) 
* New doctype - Job Applicant Source

* Source and source name field in job applicant

* Updated install_fixtures with default options

* Update install_fixtures.py

* Fixes codacy
 2018-06-21 10:47:54 +05:30
Manas Solanki
616a6d2bc2 Test leave management (#14587) 
* test max allowed days in leave policy

* test the leave period

* test leave encashment
 2018-06-20 17:47:45 +05:30
Suraj Shetty
be3ce16352 Daily work summary reply report (#14583) 
* Add daily work summary reply report

* Show user name instead of email

* Remove print statement

* Change field datatype

* ReRun Travis
 2018-06-20 17:46:03 +05:30
Nabin Hait
7aae0e66df minor fix 2018-06-20 17:45:39 +05:30
Shreya
3fd21d4273 Fix codacy 2018-06-20 16:09:16 +05:30
Shreya
5c6ade4bd8 Update and set status on the basis of project completion 2018-06-20 15:55:27 +05:30
Shreya
a5afd96019 Employee Onboarding and Separation lists 2018-06-20 15:55:14 +05:30
Ranjith Kurungadam
c1030a3958 fix - Employee Transfer, Promotion (#14603) 2018-06-20 12:42:58 +05:30
Jamsheer
a1bb94e59d Pro-rata component consistency for monthly Salary slip (#14595) 
* Pro-rata component consistency for monthly Salary slip

* Resolve merge conflict
 2018-06-20 12:41:32 +05:30
Ranjith Kurungadam
05d00397d0 Update tax calculation (#14564) 
* Tax Slab remove to_amt mandatory, condition data type Code

* Salary Slip - consider condition in tax slab

* Payroll Period - help text for tax slab condition
 2018-06-20 12:33:02 +05:30
Ranjith Kurungadam
4f9744a56d HRA fix (#14589) 
* hra - fix var ref before assignment

* Tax Exemption Category - remove deduction component
 2018-06-20 11:10:56 +05:30
Jamsheer
55a2f4da71 Employee Benefit (#14571) 
* Rename - filed is_pro_rata_applicable to pay_against_benefit_claim

* Employee Benefit Application - Validate previous benefit claim

* Employee Benefit Claim - Code refactor

* Salary Slip - additional salary - fix
 2018-06-20 11:04:21 +05:30
Jamsheer
c526cad183 [Fix] Additional Salary Component and tax calculation (#14581) 
* Additional salary not include in tax calculation

* Additional salary get doubled in salary slip via Payroll Entry - Fix

* Salary Component - if is_additional_component hide flexi
 2018-06-20 10:52:20 +05:30
Shreya Shah
0cb0c0b642 [Tests] Staffing Plan (#14585) 
* Add test case for Staffing Plan

* Fix codacy
 2018-06-20 10:50:54 +05:30
Ranjith Kurungadam
f972e7b259 Staffing Plan - remove department filter, query by dates (#14590) 2018-06-20 10:48:40 +05:30
Shreya Shah
b0575265fb Test case for Attendance Request (#14566) 
* Add test case for Attendance Request

* Add a message if attendance not submitted

* Add test for cancelled document
 2018-06-19 10:47:40 +05:30
Shreya Shah
cbff30f718 [Tests] Shift Planning (#14570) 
* Cancel shift assignment on cancellation of shift request

* [minor] Fix shift type test

* Modify test for shift request

* Add test case for shift assignment

* Fix syntax

* Fix codacy
 2018-06-19 10:45:33 +05:30
Ranjith Kurungadam
6cca03195f fix- Salary Structure filter (#14558) 2018-06-18 15:42:38 +05:30
Manas Solanki
efa191c72e [minor fix] change the unicode/str to the datetime obejct (#14534) 2018-06-15 18:04:12 +05:30
Ameya Shenoy
22c2f472e3
Merge branch 'master' into develop 2018-06-15 09:35:06 +00:00
Nabin Hait
380a74732c salary structure related test case fixes 2018-06-15 14:42:12 +05:30
Nabin Hait
2f89a04511 create user permissions on save of employee 2018-06-15 13:16:44 +05:30
Nabin Hait
fcaeea70d2
Update employee.py 2018-06-15 12:47:45 +05:30
Nabin Hait
5bc533f65d Test case fixes 2018-06-15 11:59:58 +05:30
Ranjith Kurungadam
0e5c8283fa Salary Slip - update period factor for tax calc (#14527) 2018-06-15 10:03:57 +05:30
Ranjith Kurungadam
a8e047afc8 HRA tax exemption Indian regional (#14520) 
* remove HRA fields fom declaration, proof submission

* HRA fields, methods India regional

* Company - remove Payroll Settings

* HRA India regional, override methods

* Patch to add HRA fields for India
 2018-06-14 17:56:16 +05:30
Nabin Hait
b2d3c0f040 Update ordered qty in blanket order 2018-06-14 15:56:29 +05:30
Rushabh Mehta
1198d94904 [rename] Email Alert -> Notification 2018-06-14 13:18:21 +05:30
Zarrar
6ffdf94003 [Fixes] Defaults and User-Permission based fixes in treeview (#14501) 
* utility function added for treeview
function to distinguish defaults from user permission and return appropriate data

* make use of utility function for treeview
 2018-06-14 12:24:16 +05:30
Shreya Shah
06ef4270f2
Merge pull request #14447 from zerodhatech/loan_application 
[Enhancement] toggle required fields on select of repayment option in loan application
 2018-06-14 12:05:46 +05:30
Jamsheer
c7743932ab [Fix] HR Fixes (#14511) 
* Payroll Entry - fix in db query

* Salary Structure Assignment - Company read_only = 1

* Fixes in hr util and benefit claim

* Employee Benefit Application - Late application - fix
 2018-06-14 11:55:17 +05:30
Saurabh
8e74df09a4 [fix] On deletion of salary slip decrease the series count (#14508) 2018-06-14 11:47:21 +05:30
Shreya Shah
a2056a39bd Fix patch (#14503) 
* Modify patch to move leave approvers from Employee master to Department master

* Rename child table names

- Rename leave approver to leave approvers
- Rename expense approver to expense approvers

* Import cstr

* Fix a condition
 2018-06-13 17:11:17 +05:30
Manas Solanki
aa17294979
Update utils.py 2018-06-13 16:47:41 +05:30
Jamsheer
30f37b2eb1 Payroll Entry - Separate JE for flexi salary component (#14502) 
* Payroll Entry - Accrual entry - exclude only tax impact - and separate JE for Flexi in Bank Entry

* Journal Entry - validate cheque info on submit

* Payroll Entry - Make Bamk Entry - Separate JE for benefit component
 2018-06-13 15:29:38 +05:30
Jamsheer
cc25eb00b5 Employee benefit application depends on lwp (#14494) 
* Employee benefit - pro-rata amount - depends on lwp and working days

* HR Util - get holidays for employee

* Employee Benefit Application - calculate remainig on max benefit

* Employee benefit - late application - depends on lwp

* missing semicolon
 2018-06-13 15:14:24 +05:30
rohitwaghchaure
93e8bbac84 [Fix] Travis for employee_tax_exemption_declaration (#14500) 2018-06-13 15:12:32 +05:30
Shreya Shah
4fe2a91b9f Remove docstatus=1 to show pending leaves as well (#14498) 2018-06-13 15:11:43 +05:30
Jamsheer
f6d7b5d0c8 Salary slip - additional salary - deductions (#14476) 2018-06-13 11:36:43 +05:30
Manas Solanki
176e7c5ce2 fix the test case for the payroll (#14480) 
* fix the test case for the payroll

* fix the shopify and stock entry

* more structured test cases for payroll
 2018-06-13 11:13:01 +05:30
Nabin Hait
76c51b3068 minor ux fix 2018-06-12 16:29:10 +05:30
Ranjith Kurungadam
138e6abaff Salary Slip - update tax calculation, deduct tax for unsubmitted exemption proof (#14428) 2018-06-12 12:19:36 +05:30
Suraj Shetty
e06ecd2494 Check if user permission for employee exists (#14474) 
- Also check if user has permission to
add user permission to avoid insufficient
permission error while updating user profile
 2018-06-12 12:06:41 +05:30
Jamsheer
8d66f1e45d Employee benefit - Late employee benefit application (#14465) 
* HR Utils - get salary slip total benefit given for a payroll period

* Late employee benefit application

* Additional Salary - code refactor - get_amount

* new line in salary detail json

* Employee benefit late application - validation refactor

* Codacy fix
 2018-06-12 11:30:59 +05:30
Manas Solanki
65b55a53a6
Update test_leave_application.py 2018-06-12 11:18:01 +05:30
Manas Solanki
d7f6d45e28
Merge pull request #14468 from manassolanki/fix-travis-1 
fix the salary slip test cases
 2018-06-11 19:29:28 +05:30
Manas Solanki
f226b50d6d fix the salary slip test cases 2018-06-11 19:27:46 +05:30
Shridhar Patil
c3f5849ac0 typo fixed 2018-06-11 18:26:45 +05:30
Manas Solanki
e832aa4fe2
Merge pull request #14436 from shreyashah115/fix-trav 
Travis again
 2018-06-11 17:45:11 +05:30
Shridhar Patil
6a00a17c14 toggle required fields on select of repayment option in loan application 2018-06-11 12:48:31 +05:30
Ranjith Kurungadam
e46639f47c Employee Transfer allow same company, update internal work history (#14430) 2018-06-11 11:24:44 +05:30
Shreya
83d5dc119b Fix Employee tax declaration test case 2018-06-11 10:31:40 +05:30
Shreya
956277b121 Fix tests 2018-06-11 10:31:39 +05:30
Doridel Cahanap
ebb530385a Add Employee Status Temporary Leave (#14423) 2018-06-08 14:54:31 +05:30
Zarrar
7ab70ca2d7 [ Fixes ] v11 Tree based doctype testing (#14419) 
* location tree fixes
validate if child present while deleting, filter lists down only group enabled node

* department tree fixes
Adding child fix if added from rootnode with company filter applied. Rename consistency added. Validation added in on_trash

* Company tree fix
Check if child exist while deleting a node validation added.

* Supplier Group tree fixes
on_trash validation added if child node present

* Cost Center tree fixes
Adding child to root node throws error because parent_cost_center picks up root name
 2018-06-08 14:33:15 +05:30
Shreya Shah
b9399d8781 Cancel attendance if leave application is cancelled (#14372) 
* Cancel attendance if leave application is cancelled

* Fix as per review
 2018-06-08 11:24:08 +05:30
rohitwaghchaure
2704bef0b3
Merge pull request #14368 from shreyashah115/fix-trav 
Some more travis fixes
 2018-06-07 14:14:33 +05:30
Shreya
88591314b0 Fix Leave Application test cases 2018-06-07 13:56:27 +05:30
Shreya
88fe0d59d9 Fix daily work summary test 2018-06-07 11:22:26 +05:30
Saurabh
eb579a11e1 Fix demo (#14365) 
* fix demo

* Update asset.json
 2018-06-06 15:05:31 +05:30
Ranjith Kurungadam
cff14793d8 Salary Structure, Slip - make fields readonly (#14358) 
* Salary Structure, Slip - make fields readonly

* codacy fixes

* Salary Component - reorder fields, removed is_group for flexi

* Update salary_structure.js
 2018-06-06 12:04:25 +05:30
Ameya Shenoy
873e28d9b8
Merge branch 'master' into develop 2018-06-06 05:53:19 +00:00
Nabin Hait
2f273e73b2 minor fixes 2018-06-05 14:40:48 +05:30
Nabin Hait
e0a2ea64c0 Merge branch 'develop' of https://github.com/mnaim-cloude8/erpnext into mnaim-cloude8-develop 2018-06-05 14:21:57 +05:30
Shreya Shah
630721aacc Travis (#14354) 
* Fix Purchase Receipt tests

* Fix Item test

* Fix daily work summary test

* Modify currency exchange test cases

* Fix Leave Application test

* Update working hours when making salary slip from timesheet

* Replace fixer.io with exchangeratesapi

* Fix codacy
 2018-06-05 12:56:10 +05:30
Ranjith Kurungadam
d580c92377 Staffing Plan (#14346) 
* validate staffing plan

* staffing plan docs

* get_active_staffing_plan_and_vacancies now returns dict, mandatory fields set

* validate with parent and child company plans, plan now considers open job openings

* Failure details in validate error messages

* Fixed sql injection
 2018-06-05 11:40:58 +05:30
Nabin Hait
c4eec99bc4 minor fix 2018-06-05 09:06:30 +05:30
Ranjith Kurungadam
f576c570c9 Salary Slip - fix when no pyroll period found for tax calc (#14335) 2018-06-04 12:53:23 +05:30
Nabin Hait
8c7af497a0 Fixed merge conflict 2018-06-04 11:23:36 +05:30
Ranjith Kurungadam
ed4e49c6b2 Salary Slip - Deduct Tax (#14255) 
* Salary Slip - Deduct Tax For Unclaimed Employee Benefits, Unsubmitted Tax Exemption Proof

* fix - missing return statement
 2018-06-04 11:17:55 +05:30
Nabin Hait
a55090dc88 Fixed merge conflict 2018-06-04 11:14:50 +05:30
Jamsheer
398f15754d Rename - Additional Salary Component to Additional Salary (#14302) 
* Rename Doctype Additional Salary Component to Additional Salary

* Remove unused import
 2018-06-04 11:02:53 +05:30
Nabin Hait
953ea93f7b
Update leave_type.json 2018-06-03 15:31:35 +05:30
Ranjith Kurungadam
375db6181d Earned Leave (#14143) 
* Earned Leave Allocations will be initially zero, escaped validation in leave allocation to allow this

* Earned Leave monthly scheduler method, test

* remove whitelist of method
 2018-06-01 16:09:28 +05:30
rohitwaghchaure
2fa057e4ad [Fix] Expense claim showing status as Unpaid even if Total Advance Amount and Total Sanctioned Amount is same (#14311) 2018-06-01 15:10:55 +05:30
Ranjith
590bf4ce3a codacy fixes 2018-05-31 12:08:14 +05:30
Ranjith
0cb2684130 Tax Exemption Proof Submission - validations, eligible hra calc 2018-05-30 20:51:37 +05:30
Ranjith
793f8e8caa Tax Exemption Declaration - update fields, move generic methods to utils 2018-05-30 20:50:48 +05:30
Ranjith
806cd93791 Merge remote-tracking branch 'frappe/develop' into dev_hra 2018-05-30 13:37:47 +05:30
Ranjith
155ecc1b4a Tax Exemption Declaration - HRA Calculation 2018-05-30 13:37:15 +05:30
Nabin Hait
348a6a8b17 patch fixes 2018-05-29 16:17:15 +05:30
Vladyslav Baidak
13d4391e70 Fixed SQL syntax error in Get Loan Details (#14265) 2018-05-29 15:22:05 +05:30
Ranjith
7bb621d2bf Tax Exemption Declaration, Proof Submission HRA fields 2018-05-29 13:58:31 +05:30
Nabin Hait
3aa205f19d Fixes related to department tree 2018-05-29 13:08:48 +05:30
Rohit Waghchaure
81302a8b12 [Fix] Leave application, leave approver not fetching 2018-05-28 15:10:19 +05:30
Solufyin
64d02f917a [ADD] Department Analytics Bar Chart Feature (#14217) 2018-05-26 09:26:03 +05:30
Suraj Shetty
084b0b3a67 Treeview permission (#14232) 
* Replace frappe.db.sql to frappe.get_list to apply permissions (#14037)

* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.

* Fix codacy
- Remove trailing whitespace

* Add parent filter

* Add ifnull checks
 2018-05-26 09:12:59 +05:30
Suraj Shetty
aadfaa4493 Minor fixes (#14231) 
* Parse date using getdate to avoid TypeError

* Fix alignment of application dashboard table text

* Use `user` instead of `email` to get value from user table
 2018-05-26 09:10:47 +05:30
Nabin Hait
33df0b4fbf
Test case fixes (#14219) 
* Test case fixes

* fetch_from fixes
 2018-05-26 09:09:02 +05:30
Jamsheer
e6eef3085c Remove unused imports 2018-05-25 15:20:50 +05:30
Jamsheer
9416ac4ad4 Leave Priod - fix - grant leave allocation filter by grade 2018-05-25 14:46:31 +05:30