brotherton-erpnext

Author	SHA1	Message	Date
Anurag Mishra	841d852f41	refactor: added missing translation functions (#18143 ) * fix: Translating Error and Messages * Update erpnext/controllers/item_variant.py Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com> * Update erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>	2019-07-03 15:15:08 +05:30
Mangesh-Khairnar	80fb0bf520	fix: add employee leave balance report to the dashboard	2019-07-03 13:06:46 +05:30
Mangesh-Khairnar	8d19faa598	Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management	2019-07-03 11:44:00 +05:30
Mangesh-Khairnar	0d4db95d99	fix: skip expired leaves on allocation end date	2019-07-03 11:35:51 +05:30
Nabin Hait	34c551d9a5	fix: Missing commits from hotfix branch (#17997 ) * fix: merge conflict * fix: restored missing set_gst_state_and_state_number function * fix: style linting as per codacy * fix: Fixes related to customer/lead merging * fix: merge conflict * fix: Fixes related to customer/lead merging * fix: Assign isue/opportunity to user * fix: Assign isue/opportunity to user * fix: Replaced Invoice type by GST Category * fix: merge conflict * fix: merge conflict * fix: test cases * fix: test cases	2019-07-03 10:34:31 +05:30
Suraj Shetty	19e4fde737	Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog	2019-06-30 15:30:59 +05:30
rohitwaghchaure	9dd7d3ebb3	fix: not able to make salary slip based on timesheet (#18088 )	2019-06-28 12:40:52 +05:30
Anurag Mishra	322eca61e6	fix: Wrong Casual Leave Opening in Employee Leave Balance Report fix: Wrong Casual Leave Opening in Employee Leave Balance Report	2019-06-27 17:00:55 +05:30
Anurag Mishra	0181eb0652	fix: removed unused function	2019-06-26 13:26:50 +05:30
Anurag Mishra	8a6255078b	fix: wrong Casual Leave opening	2019-06-26 13:22:34 +05:30
Himanshu Warekar	d48b2ac126	fix: attendance gantt fix	2019-06-26 11:37:49 +05:30
Mangesh-Khairnar	07aae76bbf	fix: change the department to tree view (#18057 )	2019-06-26 11:03:57 +05:30
rohitwaghchaure	2b6cb6160f	Merge pull request #18042 from rohitwaghchaure/closed_job_opening_disaplying_in_job_applicant fix: Closed job opening disaplying in job applicant	2019-06-25 16:51:03 +05:30
Rohit Waghchaure	78d6086739	fix: Closed job opening disaplying in job applicant	2019-06-24 18:05:10 +05:30
karthikeyan5	eadc144477	fix(HR): fixing bug introduced during merge conflict resolution. > while merging with https://github.com/frappe/erpnext/pull/17837	2019-06-24 15:15:38 +05:30
karthikeyan5	82256bc58b	fix(hr): Auto Attendance > fixing minor bug in shift calculation > adding 'Mark Auto Attendance' button in shift and related fixes > changed employee checkin naming series > added aditional validation for employee checkin > added/updated dashboard for Attendance, Employee, Shift Type	2019-06-24 15:15:38 +05:30
karthikeyan5	32197355ad	rename(HR): Employee Attendance Log DocType to Employee Checkin	2019-06-24 15:15:38 +05:30
karthikeyan5	e0c5176383	refactor(HR): Auto Attendance > moved all auto attendance settings from HR Settings to shift > added shift in attendance and Employee Attendance Log > reordered and cleaned up fields in HR Settings and Employee DocType	2019-06-24 15:15:38 +05:30
karthikeyan5	66e459b35d	fix(auto attendance): changes as requested in review > removed unused field from shift assignment > renamed 'biometric_rf_id' to 'attendance_device_id' > added more test cases > few other minor changes after demo	2019-06-24 15:15:38 +05:30
karthikeyan5	23cedfd6c8	feat(HR): Auto Attendance >Marking attendance based on Employee Attendance Log	2019-06-24 15:15:38 +05:30
karthikeyan5	ceea328542	fix(HR): validations and bug fixes for Attendance Log	2019-06-24 15:15:38 +05:30
karthikeyan5	a4d0ba222b	fix(HR): changes as per PR review > renamed 'Employee Checkin Log' DocType to 'Employee_attendance_log' DocType > renamed biometric_id to biometric_rf_if	2019-06-24 15:15:38 +05:30
karthikeyan5	e4bbda6ff5	feat(HR): Added Employee CheckIn Log > Employee CheckIn Log can be used to store IN/OUT Logs of employees from biometric/RFID devices. >added biometric_id in the Employee Doctype	2019-06-24 15:15:38 +05:30
Mangesh-Khairnar	bd999b0908	fix: minor changes	2019-06-21 00:49:48 +05:30
rohitwaghchaure	8b7267eb60	Merge pull request #17921 from Mangesh-Khairnar/expense-claim feat: Tax based expense claim	2019-06-20 22:02:52 +05:30
rohitwaghchaure	d2061b44dd	fix: could not find company all (#17978 )	2019-06-20 19:13:54 +05:30
Mangesh-Khairnar	8619fc7413	fix: fetch rate only if field is empty	2019-06-20 12:02:47 +05:30
Mangesh-Khairnar	0ef1df72ad	refactor: fetch rate directly from the account head	2019-06-19 17:50:33 +05:30
Mangesh-Khairnar	439313e524	Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management	2019-06-19 13:10:53 +05:30
Mangesh-Khairnar	12a2b21465	fix: track status for pending leaves	2019-06-19 13:00:52 +05:30
Suraj Shetty	a367a85a78	Merge branch 'develop' into call-summary-dialog	2019-06-18 11:09:29 +05:30
Mangesh-Khairnar	7293a98a10	fix: change formatting	2019-06-17 19:03:46 +05:30
Mangesh-Khairnar	9ee5c8a4c6	fix(employee-benefit-application): remove query from setup	2019-06-17 18:07:10 +05:30
Mangesh-Khairnar	fefdac432c	refactor: add json changes	2019-06-14 15:39:50 +05:30
Mangesh-Khairnar	24fbe23c8d	fix: add indicators for expire in the leave allocation list	2019-06-14 15:36:26 +05:30
Anurag Mishra	e87ebcaf04	fix: upadated employee dashboard	2019-06-14 14:10:48 +05:30
Anurag Mishra	0ae6cbdd01	fix: requested Changes	2019-06-14 14:10:48 +05:30
Anurag Mishra	e6dd55d9f2	feat: dashboards for HR module	2019-06-14 14:10:47 +05:30
Saurabh	0d50523723	Merge pull request #17941 from nabinhait/salary-slip-amount-dev fix: salary slip amount calculation based on formula	2019-06-14 11:19:31 +05:30
Mangesh-Khairnar	6726dea88b	style: change formatting	2019-06-14 11:17:17 +05:30
Mangesh-Khairnar	4e1b60d401	style: change formatting	2019-06-14 11:15:54 +05:30
Nabin Hait	a2caf884fe	fix: salary slip amount calculation based on formula	2019-06-13 19:44:21 +05:30
Mangesh-Khairnar	f8bf57c956	fix: remove transaction section head	2019-06-13 18:09:23 +05:30
Mangesh-Khairnar	0a3ed374cd	test: validate tax based expense claim gl entries	2019-06-12 20:03:22 +05:30
Mangesh-Khairnar	a1d354e147	feat: add grand total field	2019-06-12 18:18:38 +05:30
Suraj Shetty	a7ac218584	Merge branch 'develop' into call-summary-dialog	2019-06-12 13:28:41 +05:30
Mangesh-Khairnar	444313bdfc	feat: change the claim amount in expenses to amount	2019-06-12 12:52:02 +05:30
Kenneth Sequeira	add002bb0f	fix: Make Travel Request Document Submittable (#17874 ) * make travel request submittable * add patch * remove patch	2019-06-12 12:25:48 +05:30
Mangesh-Khairnar	283d2c5ca2	fix: only create leave application ledger on intermediate allocation expiry	2019-06-11 16:35:29 +05:30
Mangesh-Khairnar	ac9a4fe03c	feat: add tax and charges in expense claim	2019-06-11 14:25:44 +05:30
Suraj Shetty	54bb3e4b9f	Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog	2019-06-10 09:25:39 +05:30
rohitwaghchaure	74d45f40a8	Merge pull request #17876 from rohitwaghchaure/salary_slip_update_component_row_error_develop fix: Not able to save salary slip	2019-06-07 12:58:25 +05:30
Rohit Waghchaure	72264697be	fix: Not able to save salary slip	2019-06-07 11:46:27 +05:30
Mangesh-Khairnar	e4d03bf0d0	fix: consider expiry in leaves	2019-06-07 11:30:27 +05:30
Mangesh-Khairnar	368a974368	style: change formatting	2019-06-06 20:43:32 +05:30
Mangesh-Khairnar	86e0f4c617	Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management	2019-06-06 20:41:28 +05:30
Mangesh-Khairnar	c7b9ae9c5e	fix: get leave balance based on the ledger entries	2019-06-06 20:38:59 +05:30
Mangesh-Khairnar	b840ba4407	feat: show dashboard on submit	2019-06-06 20:38:23 +05:30
Mangesh-Khairnar	00c607116b	fix: handle negative leaves without allocation	2019-06-06 20:37:34 +05:30
Mangesh-Khairnar	f13243a92e	feat: fetch annual allocation based on leave policy	2019-06-06 20:35:10 +05:30
Mangesh-Khairnar	3863fc5fb2	feat: create ledger entry for each earned leave	2019-06-06 20:34:10 +05:30
Mangesh-Khairnar	050f65beb4	feat: fetch leave allocation from ledger entry	2019-06-06 20:32:01 +05:30
Suraj Shetty	c0a640c462	feat: Add user_id of employee to employee group	2019-06-06 14:47:40 +05:30
Mangesh-Khairnar	351f4d53a0	feat: add employee filter to employee leave balance	2019-06-05 21:22:07 +05:30
Mangesh-Khairnar	62011c9dc4	feat: add link to policy	2019-06-05 21:16:27 +05:30
Mangesh-Khairnar	2bd211cc05	fix(attendance): fetch employee name (#17857 )	2019-06-05 20:24:15 +05:30
Nabin Hait	3f97fac8e1	feat: Salary rounding based on settings on salary component (#17852 )	2019-06-05 13:20:08 +05:30
Himanshu	4cb1a1e2e3	fix: set task weight from onboarding template (#17840 )	2019-06-05 10:26:01 +05:30
Mangesh-Khairnar	afa1dc4ffa	feat: expire current allocation	2019-06-03 20:09:22 +05:30
deepeshgarg007	55b894bfef	Merge branch develop into dimensions	2019-06-01 23:13:36 +05:30
abhijitkumbharIND	39d6cf38fc	fix: Vehicle Master - Last carbon check accepting future date.(#17821 )	2019-05-31 14:19:04 +05:30
abhijitkumbharIND	302bce355f	fix: Vehicle Master - Last carbon check accepting future date.(#17821 )	2019-05-31 14:19:04 +05:30
Mangesh-Khairnar	c5385e141b	fix: add mandatory reason fields in leave application	2019-05-31 00:53:28 +05:30
Mangesh-Khairnar	95e5d812fe	fix: UX changes	2019-05-30 22:22:15 +05:30
Mangesh-Khairnar	91e62f575e	fix: department filters in employee leave balance	2019-05-30 13:38:35 +05:30
Mangesh-Khairnar	2124d9884b	fix: pass positional arguments on creation of leave application	2019-05-30 13:21:34 +05:30
Mangesh-Khairnar	aafb5cb6f6	fix: ignore expired non-carry forwarded allocation on calculating leaves taken	2019-05-30 13:13:14 +05:30
Mangesh-Khairnar	ded33a7e2e	fix: ledger entries creation	2019-05-29 19:12:19 +05:30
Mangesh-Khairnar	7cc6a67c18	add department filter to employee leave balance	2019-05-29 15:59:20 +05:30
deepeshgarg007	acc2422167	Merge branch develop into dimensions	2019-05-28 12:18:32 +05:30
Nabin Hait	5fef786441	Merge pull request #17765 from nabinhait/salary-slip-tax-calc-dev fix: Tax calculation on salary slip	2019-05-28 11:16:31 +05:30
Mangesh-Khairnar	c6d6adcbf3	fix: ledger entry creation for encashment	2019-05-28 09:44:38 +05:30
Mangesh-Khairnar	61bb236cfa	test: delete ledger entry after each test to maintain balance	2019-05-27 19:36:40 +05:30
Nabin Hait	7f375d209c	fix: Tax calculation on salary slip	2019-05-27 18:42:53 +05:30
Nabin Hait	1f24a4d44c	Merge pull request #17691 from netchampfaris/upload-attendance-progress fix(UX): Upload Attendance	2019-05-27 17:17:03 +05:30
Mangesh-Khairnar	35786c0067	Merge branch 'leave-management' of https://github.com/Mangesh-Khairnar/erpnext into leave-management	2019-05-27 15:42:11 +05:30
Mangesh-Khairnar	6f69bbe1d7	test: leave ledger balance	2019-05-27 15:40:36 +05:30
Mangesh-Khairnar	7fbaef5de3	fix: expiry ledger creation	2019-05-27 15:39:48 +05:30
Nabin Hait	c9a4111f4d	Merge branch 'develop' into leave-management	2019-05-27 13:59:27 +05:30
Mitchy25	a8f6938556	Fix: Precision in Appraisals (#17673 ) * Update appraisal.js This fixes issues associated with 2 decimal places. Example: 4 questions (Each weighted 25%), will give a total result of 5.2 (If 5 achieved on every question). This is because 50.25 = 1.25 which is rounded to 1.3 for precision=2. When precision = 3, this is not an issue. fix: score based on field's precisin	2019-05-27 13:57:56 +05:30
Nabin Hait	a659e615f3	Merge branch 'develop' into upload-attendance-progress	2019-05-27 13:47:36 +05:30
Anurag Mishra	9d9440277c	fix: holidays was showing on same date in calendar view (#17754 )	2019-05-27 13:20:42 +05:30
Nabin Hait	331dcc06c9	Merge branch 'develop' into upload-attendance-progress	2019-05-27 11:59:16 +05:30
Nabin Hait	5cd04a6d30	fix: payment reconciliation against expense claim (#17729 ) * fix: payment reconciliation against expense claim * feat: Added dashboard for expense claim	2019-05-27 11:44:06 +05:30
Mangesh-Khairnar	705b7dc9c2	Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management	2019-05-27 11:21:06 +05:30
Mangesh-Khairnar	71cdcb3593	style: add a more descriptive method name	2019-05-27 11:00:04 +05:30
Mangesh-Khairnar	45197965d7	fix: give cancellation permission to hr manager	2019-05-27 03:26:48 +05:30
Mangesh-Khairnar	d751281fa7	fix: application and leave encashment test cases	2019-05-27 03:23:58 +05:30
Mangesh-Khairnar	e7d307e6bf	fix: only expire carry forwarded allocation via scheduler	2019-05-27 03:21:32 +05:30
Mangesh-Khairnar	2417c93d0e	feat: create expiry and carry forward calculation on leave allocation creation	2019-05-27 03:20:10 +05:30
Mangesh-Khairnar	c99f644ffe	test: carry forward and expiry allocation	2019-05-27 03:13:47 +05:30
Mangesh-Khairnar	7a7f4bd822	fix: leave balance calculation	2019-05-27 03:12:57 +05:30
Mangesh-Khairnar	9e3b688333	test: create leave policy	2019-05-27 03:10:39 +05:30
deepeshgarg007	6f6636abfe	fix: Add dimension section in multiple doctypes	2019-05-26 12:31:01 +05:30
Faris Ansari	932a767de4	Merge branch 'develop' into upload-attendance-progress	2019-05-24 14:46:02 +05:30
Rushabh Mehta	2d7993592f	Merge pull request #17703 from rmehta/yeah-form-js refactor: deprecate old API as per https://github.com/frappe/frappe/pull/7537	2019-05-24 11:36:16 +05:30
Rushabh Mehta	7e4fb49c61	fix(minor): after manual testing	2019-05-24 11:22:31 +05:30
Mangesh-Khairnar	45cf02308e	fix: prevent manual creation of ledger entries	2019-05-23 20:29:18 +05:30
Mangesh-Khairnar	8ef81870bb	test: create leave ledger entry for encashment	2019-05-23 20:28:16 +05:30
Faris Ansari	8f784c8555	fix: Remove console statement	2019-05-23 14:39:38 +05:30
Mangesh-Khairnar	5ba17c87e5	feat: remove update allocation after submit	2019-05-22 18:29:22 +05:30
Rushabh Mehta	04e89ce808	refactor: deprecate old API	2019-05-22 16:52:36 +05:30
Faris Ansari	9e5665dc0a	Merge branch 'develop' into upload-attendance-progress	2019-05-21 18:01:30 +05:30
Faris Ansari	81e698d225	fix(UX): Upload Attendance Enqueue import if rows more than 200. Show import progress in dashboard.	2019-05-21 17:58:55 +05:30
Rushabh Mehta	98a80407f8	Merge pull request #17538 from adityahase/fix-training-feedback fix(hr): Use event_status instead of status	2019-05-21 12:19:03 +05:30
Saurabh	1bcdb094ea	Merge pull request #17630 from nabinhait/multi-fixes-dev fix: Multiple small fixes	2019-05-16 15:21:15 +05:30
Nabin Hait	b90fc7fc0d	fix: Get bank account on selection of payment mode in Loan	2019-05-16 13:45:54 +05:30
Nabin Hait	6b9d64ce1d	refator: Payroll processing and tax calculation (#17617 ) * refactor: Payroll processing and tax calculation * fix: payroll test cases * fix: Codacy fixes * fix: payroll test cases * fix: removed unwanted code	2019-05-16 11:23:04 +05:30
Himanshu	0e31089af6	validate: if additional salary exists (#17529 )	2019-05-16 10:35:02 +05:30
Mangesh-Khairnar	afb0c4aa43	fix: delete entry on cancellation of transaction	2019-05-15 21:50:34 +05:30
Mangesh-Khairnar	f8f02c508d	feat: create leave ledger entry on leave encashment creation	2019-05-15 21:50:06 +05:30
Mangesh-Khairnar	50037f8609	fix: consider min days remaining as remaining leaves	2019-05-15 21:49:27 +05:30
Mangesh-Khairnar	6ba9a128e7	feat: calculate leave balance using ledger entries	2019-05-15 15:53:54 +05:30
Mangesh-Khairnar	964deaca96	test: creation of ledger entries on application submit	2019-05-15 15:53:53 +05:30
Mangesh-Khairnar	201aeeb20d	test: creation of ledger entries on allocation submit	2019-05-15 15:53:53 +05:30
Mangesh-Khairnar	170b8dded8	fix: expiry logic for carry forwarded allocation	2019-05-15 15:53:53 +05:30
Mangesh-Khairnar	9bb4b8e8b2	feat: create expiry ledger entry on allocation period completion	2019-05-15 15:53:53 +05:30
Mangesh-Khairnar	cf8f4bda8f	fix: skip application fetch for non allocation records	2019-05-15 15:53:53 +05:30
Mangesh-Khairnar	783bd89413	feat: handle cancellation workflow for leave application	2019-05-15 15:53:53 +05:30
Mangesh-Khairnar	5448edff2c	feat: delete cancelled allocation from ledger	2019-05-15 15:53:53 +05:30
Mangesh-Khairnar	01490f1560	feat: add cancellation workflow for leave allocation ledger entry	2019-05-15 15:53:53 +05:30
Mangesh-Khairnar	5ad83c06c2	feat: add ledger entries on leave addition	2019-05-15 15:53:53 +05:30
Mangesh-Khairnar	679371e397	feat: get carry forwarded leaves via ledger entries	2019-05-15 15:53:53 +05:30
Mangesh-Khairnar	2b421c39b5	feat: add transaction details in ledger	2019-05-15 15:53:53 +05:30
Mangesh-Khairnar	1de990b2ac	feat: create leave ledger entry	2019-05-15 15:53:53 +05:30
Mangesh-Khairnar	5e2b067107	feat: display carry forwarded allocation days and total leaves allocated	2019-05-15 15:53:52 +05:30
Mangesh-Khairnar	0abf5d340c	fix: carry forwarded allocation period validation	2019-05-15 15:53:52 +05:30
Mangesh-Khairnar	d01863707c	test: pass leave type as params	2019-05-15 15:53:52 +05:30
Mangesh-Khairnar	70cf4a6796	feat: validate leave allocation period to be within expiry limits	2019-05-15 15:53:52 +05:30
Mangesh-Khairnar	99c9cfaaed	feat: generate leave allocation for carry forwarded leaves	2019-05-15 15:53:52 +05:30
Mangesh-Khairnar	4badca54af	feat: validate leave expiry days	2019-05-15 15:53:52 +05:30
Mangesh-Khairnar	0c0bfb1ef0	feat: calculate carry forward leaves allocation	2019-05-15 15:53:52 +05:30
Mangesh-Khairnar	d6c5b6320f	feat: add a field for conditionally displaying carry forwarded leave	2019-05-15 15:53:52 +05:30
Mangesh-Khairnar	e46d3a87ea	feat: set carry forwarded leave allocation	2019-05-15 15:53:52 +05:30
Mangesh-Khairnar	c28d2e4b2a	test: create leave allocation check	2019-05-15 15:53:51 +05:30
Mangesh-Khairnar	bd3b3ea12c	test: create leave type	2019-05-15 15:53:51 +05:30
Mangesh-Khairnar	7c6b6eae5b	feat: set leave allocation on carry forward check	2019-05-15 15:53:51 +05:30
Mangesh-Khairnar	1208ca6a36	feat: add old leaves to track carry forward leave allocation	2019-05-15 15:53:51 +05:30
Mangesh-Khairnar	c182a5687e	feat: add validation for carry forward leave expiry	2019-05-15 15:53:51 +05:30
Mangesh-Khairnar	fd53c64d5d	feat: create carried forward leave expiry option	2019-05-15 15:53:51 +05:30
Karthikeyan S	c3779851e4	fix(HR Settings): Unable to save HR Settings (#17608 )	2019-05-15 11:38:20 +05:30
Anurag Mishra	73706f85aa	feat: Bank remittance report for tracking payroll-entry transactions (#17013 ) * feat: Bank remittance report for tracking payroll-entry transactions * feat: show Company bank account and bank name * feat: Added Permissions to view report * feat: Validated report only if debit account is present * fix: query optimisation * feat: Added From date and To date filters * fix: code optimisation * fix: requested changes * fix: requested changes and refactor * style: indentation * style: Formatting * fix: added parameter filters	2019-05-13 19:03:21 +05:30
Mangesh-Khairnar	b4e8128fdb	feat: validate training event period	2019-05-11 23:26:47 +05:30
Aditya Hase	5f1632cf1f	fix(hr): Use event_status instead of status Training Feedback DocType has event_status field (not status) This was broken since PR #10379, PR #17197 made this failure explicit.	2019-05-09 19:00:05 +05:30
Shivam Mishra	374999b048	feat: Password protected salary slips (#17380 ) * feat: Added check for encrypting salary slips and password policy field * feat: make password policy mandatory if encrypt option is selected * feat: added password logic to email_salary_slip * fix: import error * chore: Minor enhancement to validations in salary slip * fix: travis patch * feat: Modified email body for password protected salary slips	2019-05-08 17:30:08 +05:30
Nabin Hait	5762a5d8b6	fix: Null handling	2019-05-01 12:17:55 +05:30
Nabin Hait	a08bf7ef86	fix: a few fixes in payroll	2019-05-01 12:17:47 +05:30
Nabin Hait	7516e7e66e	Merge pull request #17082 from Anurag810/aahi_loan_report feat: Loan repayment report	2019-05-01 11:02:55 +05:30
Nabin Hait	71a07bf022	Update loan_repayment.json	2019-05-01 11:02:35 +05:30
Mangesh-Khairnar	513e3f97e5	fix(salary-register): track doj for non active employee	2019-04-29 12:17:49 +05:30
Nabin Hait	ec7a18737b	fix: test cases	2019-04-25 22:30:23 +05:30
Nabin Hait	6adfc5618d	fix: test cases	2019-04-25 21:42:26 +05:30
Nabin Hait	49446ba760	fix: test cases	2019-04-25 19:54:49 +05:30
Nabin Hait	04e7bf464f	refactor: Employee Tax Exemption	2019-04-25 18:53:39 +05:30
Nabin Hait	0908907ae1	Merge branch 'develop' into aahi_loan_report	2019-04-24 09:37:52 +05:30
Nabin Hait	08da372ae5	Merge branch 'develop' into income-tax-period-factor-dev	2019-04-24 09:19:21 +05:30
Nabin Hait	8d3644d826	Merge pull request #17351 from nabinhait/rounded-salary-tax fix: Rounded tax amount in salary slip	2019-04-24 09:19:00 +05:30
Deepesh Garg	12af1c3837	Merge branch 'develop' into employee-skill-map	2019-04-24 00:03:04 +05:30
Nabin Hait	6592a6bcd4	Merge branch 'develop' into income-tax-period-factor-dev	2019-04-23 18:38:54 +05:30
Nabin Hait	24b4a8722e	fix: Rounded tax amount in salary slip	2019-04-23 15:54:32 +05:30
Suraj Shetty	df59c1573d	feat: Add training date field	2019-04-22 23:35:36 +05:30
Nabin Hait	7f4e7b63d7	fix: Income tax period factor considering joining and relieving date	2019-04-22 17:39:36 +05:30
Nabin Hait	d3cd98c45e	fix: Renamed depends_on_lwp to depends_on_payment_days	2019-04-22 13:45:45 +05:30
Suraj Shetty	2a9b17efd4	Merge branch 'develop' of github.com:frappe/erpnext into employee-skill-map	2019-04-21 23:53:54 +05:30
Suraj Shetty	98390dae49	fix: Do not create employee user permission if already exists	2019-04-19 21:52:08 +05:30
Suraj Shetty	3aa5e125bd	feat: Add employee training section to the employee skill map	2019-04-18 12:46:33 +05:30
Faris Ansari	1cf9fa9662	fix: Refactor Upload Attendance (#17241 ) New API frappe.ui.FileUploader https://github.com/frappe/frappe/pull/7253	2019-04-17 09:45:46 +05:30
Nabin Hait	d2044c0f23	Merge pull request #17184 from frappe/akurungadam-patch-1 fix: misleading condition example in field options	2019-04-16 12:44:17 +05:30
Suraj Shetty	006c3dccf9	feat: Add logic to auto fetch skill from designation doc - Set today as default evaluation date	2019-04-16 12:14:44 +05:30
Suraj Shetty	354c70a0e7	feat: Init employee skill map doctype	2019-04-16 10:20:32 +05:30
Suraj Shetty	a0f7656ffc	feat: Add skill child table to designation doctype - To record skills required of a particular designation	2019-04-16 10:19:53 +05:30
Nabin Hait	6ecc83aaf0	Merge pull request #17182 from hrwX/revert_salary_slip Revert(Salary Slip): Wrong Formula	2019-04-15 10:08:53 +05:30
Suraj Shetty	c90364f94d	feat: Add task weight for employee onboarding activity (#17216 ) This activity weight will be used to update the task weight	2019-04-12 14:12:03 +05:30
Nabin Hait	851acc30b3	Merge pull request #17208 from asbasawaraj/fixed_sanctioned_amount_update_issue fix: Fixed Sanctioned Amount Update Issue in Expense Claim	2019-04-12 11:06:02 +05:30
Basawaraj Savalagi	9ce8c3061f	Fixed Sanctioned Amount Update Issue in Expense Claim	2019-04-11 16:30:11 +05:30
Nabin Hait	89206e74d0	fixed merge conflict	2019-04-11 12:31:14 +05:30
Nabin Hait	c8c678f747	fix: training feedback code cleanup	2019-04-10 15:56:16 +05:30
Anoop	cb278975f3	fix: misleading condition example in field options condition example corrected - gender=\"Male\" to gender==\"Male\"	2019-04-09 18:10:41 +05:30
Himanshu Warekar	5632dbdd18	revert: wrong formula	2019-04-09 16:53:54 +05:30
Mangesh-Khairnar	e7d53540de	feat: add doj column in salary register	2019-04-05 12:56:11 +05:30
Nabin Hait	4873875c1c	Merge pull request #17038 from netchampfaris/fix-leave-application-condition fix: Missing "and" in filter conditions	2019-04-01 11:15:36 +05:30
Anurag Mishra	5402451b35	feat: Loan repayment report Co-authored-by: crescent28 <mitali@erpnext.com>	2019-04-01 10:57:36 +05:30
Rohit Waghchaure	70b996af73	fix: test cases	2019-03-31 20:34:52 +05:30
Himanshu	6343a697a2	fix(Salary Slip): Consider Leave without Pay for calculation (#16926 ) while net salary calculation, it was not considering actual days worked but now it will consider it	2019-03-29 18:48:56 +05:30
Himanshu	6b54649bfe	fix(Salary Slip): Consider Leave without Pay for calculation (#17023 ) Please read the pull request checklist to make sure your changes are merged: https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist	2019-03-29 18:32:23 +05:30
Faris Ansari	f04988a02f	fix: Missing "and" in filter conditions	2019-03-28 15:42:07 +05:30
Saurabh	84a18f5b18	Merge branch 'master' into develop	2019-03-28 13:54:34 +05:30
Himanshu	e43b6beff0	fix(Leave Balance Report): total allocated leaves not calculated properly (#16969 ) * fix: total alloted leaves not calculated properly * fix: Possible SQL injection * typo fix in sql query * prevent sql injection again ? * Use ORM for query	2019-03-26 21:42:12 +05:30
Rushabh Mehta	b0a7cbb591	Merge pull request #16905 from frappe/netchampfaris-patch-1 fix: Update Training Level	2019-03-22 12:43:00 +05:30
Rushabh Mehta	fc4eefcb22	Merge pull request #16871 from rmehta/attendance-from-leave feat: Pre mark attendance for Leave Application	2019-03-22 12:41:47 +05:30
Saurabh	3c95387926	Merge branch 'master' into develop	2019-03-20 14:39:49 +05:30
Mangesh-Khairnar	7fc1bc0b27	fix: handle an empty match query condition in leave application (#16931 )	2019-03-19 18:14:02 +05:30
Himanshu	f3e5213190	feat(Support): Service Level Agreements (#16828 ) * init SLA * Added more inputs to the forms * set priority of issue * Removed UOM in favor of hours for tracking * updated js to autofill values * Removed unwanted fields * timer functionality * code refactor * parenthesis fix * fixed typo * added new fields * Updated fields * Updated fields for issue doctype * Updated fields for issue doctype * changed doctype structure * added new fields to issue * code refactor * new function to set criticality level * changed dropdown options * set timer for sla * calculation of resolution and response time * stopwatch counter * dashboard changes * renamed sla to support contract * countdown timer section * issue doctype changes * removed unwanted imports * fixed wrong response time and resolution time * update response and resolution time * calculate time to respond and resolve * feature enhancements * probable scheduling bug fix * fixed scheduling issue support sent out of support time * removed issue criticality link from support * Changed day order * skip date validation when support contract is default * removed mandatory field * fix scheduling conditions for now * code refactor * removed duplicate doctypes * fixed day inserted twice in service level * check to not add another default contract * default support contracts * removed commented code * removed unused imports * fix sla for non-listed days * reduced redundant code and optimized it and starting unit tests * added condition check to compute days correctly * renamed doc as per guidelines and added conditions for scheduling * removed per day support timings * added response and resolution time to support contract * scheduling based on hours kinda fix * set sla before_update and finally fixed time scheduling out of support time * DocType Issue removed test_records and rewrote test cases * test cases and codacy fixes * Doctype SLA instead of Support Contract to avoid confusion with Contract * fixed tests failing due to change in options for time period * change naming to Prompt * remove unknown doctype from help_desk * revert unwanted changes to default * refactor get_list for fetching service_level_agreement * change datatypes * fix tests * refactored tests * remove unused imports * code and comments refactor for better understandability * removed and renamed doctype to service days and minor fixes * Refactor test cases for response and resolution time for issue * add validation to check if response time < resolution time * minor fix for checking if current day is start day * calculate time in js rather than python * fix: parenthesis fixing customer dashboard * json changes to rename sections * refactor: alignment * refactor: beautify code * fix: use frm api to get the element * fix: replace '__' with '_' * refactor: remove pointless test	2019-03-19 16:47:56 +05:30
Faris Ansari	5f8b358fd4	Website: Product Configurator and Bootstrap 4 (#15965 ) - Refactored Homepage with customisable Hero Section - New Homepage Section to add content on Homepage as cards or using Custom HTML - Products page at "/all-products" with customisable filters - Item Configure dialog to find an Item Variant filtered by attribute values - Contact Us dialog on Item page - Customisable Item page content using the Website Content field	2019-03-19 11:48:32 +05:30
Rohit Waghchaure	d4e4316d0b	fix: test cases and codacy	2019-03-18 14:18:49 +05:30
Mangesh-Khairnar	b343407236	refactor: change validate email add to validate email address	2019-03-16 13:40:58 +05:30
Rushabh Mehta	b7abdf1222	Merge pull request #16851 from JoyceBabu/develop fix: Add 'Half-Yearly' option to Earned Leave Frequency	2019-03-15 09:02:43 +05:30
Faris Ansari	47f1080f1e	fix: Update modified	2019-03-12 10:57:35 +05:30
Faris Ansari	175709ed50	fix: Update Training Level - Rename Expert to Intermediate, since it was ambiguous with Advance	2019-03-12 10:55:39 +05:30
Faris Ansari	2221151132	fix: Update Training Level	2019-03-12 10:55:11 +05:30
Rushabh Mehta	96842c9de6	fix(typo): leave_application.py	2019-03-08 12:36:43 +05:30
Rushabh Mehta	701c0b792c	feat: Pre mark attendance for Leave Application	2019-03-08 12:30:42 +05:30
deepeshgarg007	78a32ae172	fix: Remove validation for relieving date from additional salary	2019-03-07 20:00:07 +05:30
Joyce Babu	3d0121369f	Add 'Half-Yearly' option to Earned Leave Frequency in addition to the current values of Monthly, Quarterly and Yearly	2019-03-06 13:04:45 +05:30
Himanshu Warekar	219b9f4150	Salary Component can be equal to zero	2019-03-05 17:44:07 +05:30
Himanshu Warekar	acb7238ad6	Allow zero amount in additional salary	2019-03-05 12:20:19 +05:30
Rushabh Mehta	fcd0556119	Merge pull request #16709 from rmehta/project-template feat: Project Template	2019-02-27 09:22:12 +05:30
Sagar Vora	e0eafb1c2c	Merge branch 'master' into develop	2019-02-26 17:08:59 +05:30
Rushabh Mehta	b94c8b1c77	fix(tests): add test for bulk complete / cancellation of project	2019-02-26 14:30:38 +05:30
Rushabh Mehta	e2de8e0fa5	fix: expense claim type (#16760 )	2019-02-25 11:56:30 +05:30
Saurabh	3dd7ddd838	Merge branch 'master' into develop	2019-02-21 18:25:29 +05:30
Nabin Hait	40c15d2e74	fix: Calendar events for leaves considering user permissions	2019-02-20 18:55:38 +05:30
Sagar Vora	cc6e51c62d	Merge branch 'master' into develop	2019-02-19 18:09:49 +05:30
deepeshgarg007	de0f59b818	fix: Removed precision from multiple doctypes	2019-02-19 08:40:16 +05:30
Tropicalrambler	3a88bc43dc	fix: typo in salary register report field name (#16670 ) When assigning salary slip field values to row list for salary register, line 22, the field was incorrectly spelled. The correct value in the Salary Slip DocType is `leave_without_pay`, and this change reflects this. Line 27 also reflects this adjustment.	2019-02-15 13:40:44 +05:30
Sagar Vora	551f52fd25	Merge branch 'master' into develop	2019-02-12 16:41:24 +05:30
Nabin Hait	fdefbdb23b	Merge pull request #16609 from nabinhait/multipel_fixes Multiple fixes	2019-02-12 13:56:06 +05:30
Zlash65	fd3998cfc9	fix: make branch as link field	2019-02-12 11:27:23 +05:30
Nabin Hait	e3b0f4f9f6	fix: removed account type filter on employee advance account	2019-02-08 16:56:26 +05:30
Sagar Vora	da1dc7fa52	Merge branch 'master' into develop	2019-02-05 18:40:39 +05:30
Nabin Hait	38b05a1296	fix: Set default cost center in payroll entry	2019-02-05 10:46:41 +05:30
Nabin Hait	294319e71b	fix: Don't force fetch cost center from company in payroll entry	2019-02-05 10:37:41 +05:30
Nabin Hait	ff05ee50e0	fix: Allow-on-submit enabled for formula and condition in salary structure	2019-02-04 14:42:57 +05:30
Sagar Vora	56cbfe4bb0	Merge branch 'master' into develop	2019-01-31 13:34:32 +05:30
Sagar Vora	7ea2497b9a	Fix salary patch (#16531 ) fix: salary structure assignment patch, add .vscode to gitignore	2019-01-31 09:17:29 +05:30
Saurabh	a342138625	Merge branch 'master' into develop	2019-01-30 12:38:58 +05:30
rohitwaghchaure	25e63e806c	fix: modified date (#16520 )	2019-01-30 11:46:34 +05:30
Sagar Vora	f97c5dad82	Merge branch 'staging' into develop	2019-01-29 18:39:14 +05:30
Sagar Vora	51a27b3524	fix: unsaved merge conflict	2019-01-29 17:52:47 +05:30
Sagar Vora	f3cfad7595	Merge branch 'master' into staging-fixes	2019-01-29 17:20:46 +05:30
Navdeep Ghai	ec570026e1	Merge branch 'hotfix' into salary-slip-net-pay-fixes	2019-01-29 09:12:37 +04:00
Nabin Hait	385e3bb284	Merge pull request #16446 from Zlash65/jv-fix fix(accounts): wrong filters sent to fetch reference name in Journal Entry	2019-01-29 10:41:15 +05:30
navdeepghai1	92bb84aa70	Changed static precision(2) value to system setting currency_precision value	2019-01-28 16:54:58 +04:00
navdeepghai1	aac404a155	Fixed net_pay calculation issue	2019-01-28 10:42:16 +04:00
Nabin Hait	06607fda4e	fix: removed print statement	2019-01-23 12:15:48 +05:30
Aditya Hase	f3c22f342c	fix(unicode): Import unicode_literals in every file	2019-01-22 18:36:10 +05:30
Sagar Vora	4d1a9b10ed	Merge branch 'staging' into develop	2019-01-22 15:56:39 +05:30
Zlash65	c8d632ddff	fix: add set query for payroll entry in JV	2019-01-22 12:46:13 +05:30
Nabin Hait	bef2c22d23	Fix: merge conflict	2019-01-18 10:15:47 +05:30
Rohit Waghchaure	425dff93d7	fix: Project update status code and design refactored	2019-01-17 19:21:44 +05:30
Nabin Hait	c13b0562ba	Merge pull request #16337 from Anurag810/Employee fix: Employee Onboarding/Seperation task Assignment	2019-01-08 20:27:43 +05:30
scmmishra	e2762df90b	Fix: Naming series not reflecting in leave application	2019-01-08 17:38:28 +05:30
Saurabh	afec3ca89a	Merge branch 'staging' into develop	2019-01-08 17:09:36 +05:30
Sagar Vora	26e5c9480b	Merge branch 'staging-fixes' into fixed_salary_structure_employee_reqd	2019-01-07 14:30:23 +05:30
Sagar Vora	3c74266763	fix: PEP8 recommended whitspace	2019-01-07 13:13:16 +05:30
Sagar Vora	23a1b98957	fix: remove unnecessary code	2019-01-07 13:10:18 +05:30
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

... 8 9 10 11 12 ...

2171 Commits