brotherton-erpnext

Author	SHA1	Message	Date
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
Manas Solanki	730cb3b547	Update employee.py	2018-05-25 14:46:21 +05:30
Jamsheer	fca88a6b22	Employee benefits - get_assigned_salary_structure	2018-05-25 14:35:02 +05:30
Jamsheer	79a6b42353	Salary Slip - options to fetch from migration	2018-05-25 12:56:22 +05:30
Jamsheer	ce89199abb	taxable salary slabs remove from Salary Component and add to Payroll Period	2018-05-25 12:52:23 +05:30
Jamsheer	f1d10bf286	Salary Component - remove flexi_default	2018-05-25 12:52:23 +05:30
Jamsheer	620c3a872c	Employee Benefit Claim - non pro-rata claim validation updated	2018-05-25 12:52:23 +05:30
Jamsheer	dc698a891d	options to fetch from migration	2018-05-25 12:52:23 +05:30
Jamsheer	8eec40cb8a	Employee Benefits in Salary Slip - Application and Claim	2018-05-25 12:46:31 +05:30
Jamsheer	16e924333e	get payroll period days - fix	2018-05-25 12:46:31 +05:30
Jamsheer	47d865baa0	Calculate remaining benefit amount in Employee Benefit Application	2018-05-25 12:46:31 +05:30
Jamsheer	8a953ba516	Validate remaining benefit amount in Employee Benefit Application	2018-05-25 12:46:31 +05:30
Jamsheer	772f257ff3	Employee Benefit Claim - date default to Today	2018-05-25 12:46:31 +05:30
Jamsheer	eacaad3aec	Max benefit amount in Employee Benefit Application Detail	2018-05-25 12:42:21 +05:30
Jamsheer	c1ae88ba02	Employee Benefit Calim - earning component filter updated	2018-05-25 12:42:20 +05:30
Jamsheer	c5629efe0e	Employee Benefit Application - refactor validation	2018-05-25 12:42:20 +05:30
Jamsheer	9d5d328a4f	Salary Structure - validate flexi with max benefit	2018-05-25 12:42:20 +05:30
Jamsheer	65a5e47e68	Payroll Period - validate dates and overlap	2018-05-25 12:37:36 +05:30
Jamsheer	cf414cc499	Payroll Period - fields refactor	2018-05-25 12:37:36 +05:30
Jamsheer	2ee211ad21	Salary Structure - validate max benefits with flexi	2018-05-25 12:37:36 +05:30
Jamsheer	ce7310255e	Salary Structure - filter for earnings	2018-05-25 12:37:36 +05:30
Jamsheer	43e191289c	Employee Benefit Application - earning component filter by salary structure flexi component	2018-05-25 12:37:36 +05:30
Jamsheer	77a91f0d01	Salary Component - account mandatory for separate payment entry	2018-05-25 12:37:36 +05:30
Jamsheer	1248f6a752	Codacy fix	2018-05-25 12:37:36 +05:30
Jamsheer	0493c22f3c	Additional Salary Component - filter updated - salary_component	2018-05-25 12:37:35 +05:30
Jamsheer	f647aa15af	Salary Component - fields - refactor fields behaviour	2018-05-25 12:37:35 +05:30
Jamsheer	334bd189a7	Employee Benefit Application - filter updated - earning component	2018-05-25 12:37:35 +05:30
Jamsheer	da24722beb	Employee Benefit Claim - filter for earning component	2018-05-25 12:37:35 +05:30
Jamsheer	ce88bdf005	Employee Benefit Claim - Validation Updated - Code refactor	2018-05-25 12:37:35 +05:30
Nabin Hait	d5cb4c10a1	Set parent department if missing and not root itself	2018-05-23 18:36:18 +05:30
Zarrar	c141eb00ee	[Enhance] Department added wherever applicable (#14121 ) * set All Department as default parent_department * add department field in employee_transfer * copied data from options to fetch_from * add department field wherever employee's link field present * empty options field where fetch_from is added	2018-05-23 11:11:36 +05:30
Suraj Shetty	e03937fd6a	Send daily work summary alert to only enabled users (#14175 ) * Send daily work summary alert to only enabled users * Fix import	2018-05-23 10:32:55 +05:30
Faris Ansari	26eb513274	Rename occurences of max_days_allowed to max_continuous allowed (#14180 )	2018-05-23 10:31:39 +05:30
Ameya Shenoy	1cc7500be9	Merge branch 'master' into develop	2018-05-22 09:18:38 +00:00
Rohit Waghchaure	8e12a59d9b	[Fix] Patch	2018-05-21 18:52:07 +05:30
Ameya Shenoy	35984daf72	relieving_date wasnt of type datetime	2018-05-21 16:37:27 +05:30
Rohit Waghchaure	11e2a9ac90	[Fix] Permission issue while saving leave application	2018-05-21 15:39:38 +05:30
rohitwaghchaure	1275ea5123	Merge pull request #14154 from rohitwaghchaure/set_default_leave_approver Set leave approver in the leave application	2018-05-21 11:58:41 +05:30
Shridhar Patil	4c790488ea	job opening designation made mandatory (#14153 )	2018-05-21 10:30:17 +05:30
Rohit Waghchaure	812224e56e	Set leave approver in the leave application	2018-05-20 21:21:33 +05:30
Zarrar	1f3f18534b	[Fix] Leave Application & Expense Claim query fix \| Leave Balance Report fix (#14149 ) * move set_query to setup function * rectify leave balance report according to deparmtent changes	2018-05-20 10:45:14 +05:30
Manas Solanki	d976c04b69	Merge pull request #14134 from manassolanki/fix-salary-patch [fix] patch for the salary structure assignment for old employees	2018-05-18 15:47:14 +05:30
Manas Solanki	33c1a38dc8	[fix] patch for the salary structure assignment for old employees	2018-05-18 15:46:35 +05:30
Shreya	65dd1f6b4c	Mark attendance only if to_date <= nowdate in Leave Application	2018-05-17 17:13:56 +05:30
rohitwaghchaure	8c6b7557db	Merge branch 'develop' into jam_enterprise_emp_benefit	2018-05-17 14:08:06 +05:30
rohitwaghchaure	4444430200	Merge pull request #14108 from ESS-LLP/tax_deduction Variable tax deduction	2018-05-17 13:55:52 +05:30
Ranjith	58363e6bbd	get_payroll_period return name, fix hard coded leave period	2018-05-17 10:00:33 +05:30
Zlash65	e3f7e8b101	typo in frappe.throw in employee_transfer	2018-05-17 01:34:35 +05:30
Ranjith	31eeff00f7	merge frappe/develop	2018-05-16 23:24:34 +05:30
Ranjith	b485b1ef80	Salary Slip calc tax, except for flexi benefits	2018-05-16 23:01:40 +05:30
Ranjith	c6b2575a9c	fields in salary detail, copy data from salary component on change	2018-05-16 22:59:21 +05:30
Rohit Waghchaure	8e4f676c8c	[Fix] onload set default employee, leave approver, company	2018-05-16 19:55:52 +05:30
Jamsheer	8b86d18f73	Remove unused imports	2018-05-16 19:50:30 +05:30
Jamsheer	3434aabc28	Employee Benefit Claim in Salary Slip	2018-05-16 19:50:30 +05:30
Jamsheer	3abae9c1ba	Employee Benefit Application - whitlist method get_max_benefits	2018-05-16 19:50:30 +05:30
Jamsheer	3e64297a3d	Employee Benefit Application - validate maximun benefit	2018-05-16 19:50:30 +05:30
Jamsheer	3cd0ad4c98	Codacy fixes	2018-05-16 19:50:30 +05:30
Jamsheer	c9287b5b88	Manage grouping of salary component for flexible benefit	2018-05-16 19:50:30 +05:30
Jamsheer	6410022cab	minor fixes	2018-05-16 19:49:39 +05:30
Jamsheer	c678d037e7	Salary slip - throw if no default flexi component	2018-05-16 19:49:39 +05:30
Jamsheer	5f6e274505	Salary slip - default flexi component	2018-05-16 19:49:39 +05:30
Jamsheer	43740a6511	Employee Benefit Application - employee benefit in salary slip	2018-05-16 19:49:39 +05:30
Jamsheer	0bc665c0a5	Salary Copmonent - Default flexible componnent	2018-05-16 19:49:39 +05:30
Jamsheer	15613e46ad	Salary Copmonent - Defualt flexible componnent	2018-05-16 19:48:47 +05:30
Jamsheer	d63c39a514	Payroll Period - get payroll period days	2018-05-16 19:47:18 +05:30
Jamsheer	d66fb842c1	Employee Benefit Application - validate max benefit for employee	2018-05-16 19:47:18 +05:30
Jamsheer	2d6901d5dc	Employee Benefit Application - validate max benefit amount for component	2018-05-16 19:47:18 +05:30
Jamsheer	9cb2fc2766	Employee Benefit Application - calcluate benefit amount	2018-05-16 19:47:18 +05:30
Jamsheer	d48998bae1	Employee Benefit Application - Calculate benefit amounts	2018-05-16 19:47:18 +05:30
Jamsheer	779f8ebbb3	Employee Benefit Application - get max benefit	2018-05-16 19:47:18 +05:30
Jamsheer	41616de9cc	Employee Benefit Application - validate duplicate	2018-05-16 19:47:18 +05:30
Jamsheer	9cd292b187	Employee Benefit Application - filter updated	2018-05-16 19:47:18 +05:30
Jamsheer	4d93d339f7	Employee benefit - filters fro earning component	2018-05-16 19:47:18 +05:30
Ranjith	29e0ed3da1	Exemption Declaration - field total_amount	2018-05-16 19:10:35 +05:30
Manas Solanki	5b34c00ba6	Added the travel request on the config page	2018-05-16 18:09:43 +05:30
Shreya	fda15702bc	Fix error	2018-05-16 16:14:34 +05:30
Manas Solanki	4534df36a9	Merge pull request #14078 from manassolanki/pos-fix [enterprise] minor fixes	2018-05-16 14:53:21 +05:30
Manas Solanki	4256a34220	[enterprise] minor fixes make the employee name mandatory in the employee onboarding added the retention bonus amount	2018-05-16 14:51:25 +05:30
Manas Solanki	9b53b93e37	Merge pull request #14077 from manassolanki/travel-request [rename] Photo ID -> Identification Document	2018-05-16 14:13:13 +05:30
Manas Solanki	6eb7f346bd	[rename] Photo ID -> Identification Document	2018-05-16 14:12:22 +05:30
rohitwaghchaure	9ad0ac9557	Merge pull request #14068 from manassolanki/travel-request [feature] added travel request doctype in HR	2018-05-16 14:05:26 +05:30
Suraj Shetty	fbb6b3da5f	Undo replace of frappe.db.sql with frappe.get_list (#14074 )	2018-05-16 13:53:31 +05:30
Ranjith Kurungadam	cdd4704485	Fixes, fields in Salary Component (#14071 ) * remove duplicate fields * Salary Component - fields is_tax_applicable, is_payable * fix intendation	2018-05-16 13:10:08 +05:30
Rushabh Mehta	e07b332514	fix for tests	2018-05-16 13:05:13 +05:30
Rushabh Mehta	0b628386de	[minor] remove in_dialog old property	2018-05-16 12:51:22 +05:30
Ranjith	db120fb0bc	Salary Component - fields is_tax_applicable, is_payable	2018-05-16 12:17:16 +05:30
Ranjith	447f0e495a	remove duplicate fields	2018-05-16 12:13:46 +05:30
Rushabh Mehta	b56f3d0689	[fix] syntax errors	2018-05-16 12:03:39 +05:30
Shreya	2a1bcf285b	[minor] Fix typo	2018-05-16 11:06:02 +05:30
Manas Solanki	d11b5d398d	[feature] added travel request doctype in HR	2018-05-16 11:02:28 +05:30
Rushabh Mehta	bc5c04f438	Update job_offer.js cur_frm is deprecated	2018-05-16 10:51:15 +05:30
Suraj Shetty	8501010f12	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	2018-05-16 10:44:38 +05:30
Shreya Shah	11f3e8155b	Import nowdate (#14064 )	2018-05-16 10:42:09 +05:30
Rohit Waghchaure	d3e84a6944	[Fix] Issue, local variable 'leaves_encashed' referenced before assignment	2018-05-16 09:39:44 +05:30
rohitwaghchaure	4671c53eb0	Merge pull request #14056 from ESS-LLP/retention_bonus Retention bonus	2018-05-15 22:27:04 +05:30
rohitwaghchaure	41b457076d	Merge branch 'develop' into enterprise_fix	2018-05-15 22:26:11 +05:30
Ranjith	d43e068a5b	fix Leave Encashment unlink additional component, readonly encashed days	2018-05-15 20:11:30 +05:30
Ranjith	c60c6981a5	Merge remote-tracking branch 'frappe/develop' into encash	2018-05-15 20:00:26 +05:30
Jamsheer	3beeb7255f	Compensatory Leave Request - add link to leave allocation	2018-05-15 19:42:27 +05:30
Jamsheer	ebb68afecb	Leave Allocation - remove link to compensatory leave request	2018-05-15 19:41:25 +05:30
Jamsheer	a46ce11af9	Additional Salary Component - naming and date fix	2018-05-15 19:20:51 +05:30
Ranjith	819c3b1bf6	Retention Bonus - menu, validate	2018-05-15 19:17:31 +05:30
Ranjith	7d394c14ce	Email Alert for Retention Bonus	2018-05-15 19:15:58 +05:30
Manas Solanki	70899f5a60	Update utils.py	2018-05-15 18:52:14 +05:30
anoop	bb629de49b	doctype retention bonus	2018-05-15 18:41:46 +05:30
Zlash65	b8bd6644fd	remove unused module import and error classes	2018-05-15 18:23:41 +05:30
anoop	504855e1a0	on submit: create additional salary component, revert on cancel	2018-05-15 18:11:49 +05:30
Ranjith	4c721cbe0f	Leave Encashment - submit, cancel Additional Salary Component	2018-05-15 16:39:20 +05:30
Rohit Waghchaure	e0b515066e	[Fix] Employee mandatory validation issue	2018-05-15 16:18:05 +05:30
rohitwaghchaure	66ece67d41	Merge pull request #14044 from shreyashah115/fix-promotion-doc [Fix] Updation of new values in Employee Property History	2018-05-15 15:27:16 +05:30
Shreya	14069c9395	Fix updation of new values While changing the property of an employee, if the new value is selected from the available values in the link field, it worked properly but on creation of a new linked field value, the new value didn't get updated in the child table.	2018-05-15 15:19:24 +05:30
Manas Solanki	183dc731c2	Update employee_onboarding.py	2018-05-15 14:32:37 +05:30
Zlash65	99e72af089	skip abbr, reload doc, disable edit for root department node'	2018-05-15 13:53:40 +05:30
Saurabh	62a59301ef	[fix] resolved merge conflicts	2018-05-15 13:02:40 +05:30
Rohit Waghchaure	4a126947f5	Code cleaup	2018-05-15 12:43:21 +05:30
anoop	6119b7337c	updated get_leave_balance_on to consider encashed leaves by default.	2018-05-15 12:36:43 +05:30
anoop	1e1b7fc74f	13615 - Leave Encashment, creating Additional Salary Component on submit and validations pending	2018-05-15 12:36:43 +05:30
anoop	0780fd1e0b	helper method to get employees assigned salary structure	2018-05-15 12:36:42 +05:30
anoop	161b3b2979	added field Total Leaves Encashed	2018-05-15 12:35:51 +05:30
anoop	067b5574ce	duplicate field is_encash removed, fixed in install fixtures	2018-05-15 12:27:23 +05:30
Rohit Waghchaure	3f02820384	[Fix] Global name 'Approved' is not defined	2018-05-15 10:30:06 +05:30
Shreya	dbb67fb4fd	Clear leave balance on changing leave type	2018-05-14 23:02:09 +05:30
Rohit Waghchaure	9ba72f7897	[Fix] get_approved_leaves_for_period module import failed	2018-05-14 21:37:55 +05:30
Saurabh	2ca83d61ea	Resolve merge conflicts from enterprise_sprint branch	2018-05-14 21:15:46 +05:30
Saurabh	1f1dd96f57	Merge branch 'enterprise_sprint' into jam_enterprise_sprint	2018-05-14 20:57:40 +05:30
rohitwaghchaure	3f0c735e53	Merge branch 'enterprise_sprint' into tax_exemption	2018-05-14 20:47:35 +05:30
Saurabh	2d8a7ee81f	Bootstrap 'TDS' via fixture	2018-05-14 20:41:38 +05:30
rohitwaghchaure	8137f0402a	Merge pull request #13984 from manassolanki/employee-boarding [feature] added the employee onboarding and separation doctype	2018-05-14 20:35:49 +05:30
Manas Solanki	094e1841e0	minor changes and fixed the conflicts	2018-05-14 20:33:28 +05:30
rohitwaghchaure	3282191aae	Merge pull request #14025 from shreyashah115/html-table Show pending leaves as an HTML table in leave application	2018-05-14 20:32:26 +05:30
Manas Solanki	b698846c30	[feature] added the employee onboarding and separation doctype	2018-05-14 20:27:00 +05:30
rohitwaghchaure	8d626e6888	Merge pull request #14024 from ESS-LLP/jam_additional_sal_comp Additional Salary Component	2018-05-14 20:24:10 +05:30
Shreya	4bd5583e11	Make Available Leave HTML Table	2018-05-14 19:32:59 +05:30
Jamsheer	75c53e5022	Fix - missing semicolon	2018-05-14 19:17:16 +05:30
Jamsheer	47039e801e	Remove unused import	2018-05-14 18:54:10 +05:30
Jamsheer	70a998d428	Remove unused variable	2018-05-14 18:51:04 +05:30
Jamsheer	f5e67213fd	Attendance Request - half day check is enabled	2018-05-14 18:34:34 +05:30
Jamsheer	ead858b4de	Compensatory Leave Request - fix	2018-05-14 18:08:31 +05:30
Jamsheer	b848c51592	Compensatory Leave Request - leave allocation create and update - fix	2018-05-14 17:56:22 +05:30
Zlash65	03ad0f2f4a	set query for department based on company	2018-05-14 16:07:28 +05:30
Zlash65	9a8f5bd6c7	set department name with company abbr	2018-05-14 16:07:27 +05:30
Zlash65	39668609ce	improv department tree	2018-05-14 16:07:27 +05:30
Shreya Shah	bbee9b6cc4	[Enhancement] Monthly Attendance Report (#13970 ) * Update Attendance on Approval of Leave * Separate out leaves on the basis of its type * Remove commented code * Make attendance records if not found * Fix Codacy * Replace bad code in attendance.py	2018-05-14 14:30:58 +05:30
Jamsheer	236be22648	Payroll entry - get employee fix	2018-05-14 13:32:50 +05:30
Jamsheer	d0b0c87f40	get additional salary component in salary slip	2018-05-14 12:16:46 +05:30
Jamsheer	08b60a1a62	New Doctype - Additional Salary Component	2018-05-14 12:16:46 +05:30
Jamsheer	a5028c8e54	Salary Structure - filter updated, Salary Component - fields re-arranged	2018-05-14 12:16:45 +05:30
Jamsheer	b5c5c471b4	Formula on Salary Component Master	2018-05-14 12:16:45 +05:30
Jamsheer	4bd7cdb018	Salary Structure Assignment - filters applied	2018-05-14 12:13:47 +05:30
Saurabh	c1acbdfb69	[fix] overlapping dates	2018-05-12 17:45:39 +05:30
Saurabh	a35dad7610	add get leave period method	2018-05-12 17:45:39 +05:30
Jamsheer	46b23f8e6e	Salary Structure Refactor, Formula on Salary Component Master (#13967 ) * Salary structure refactor * Salary Structure Assignment - filters applied * Formula on Salary Component Master * Salary Structure - filter updated, Salary Component - fields re-arranged * Payroll Entry - get_employee_list fix * Salary Structure Assignment - Validate Duplicate Assignment * Salary Structure Assignment - filters for salary structure	2018-05-11 21:05:24 +05:30
Pawan Mehta	c53e35368d	Shift Management - Documentation and Tests (#13997 ) * [fix] #13996 * codacy fix	2018-05-11 21:03:50 +05:30
Ranjith	ded636097e	Tax Declaration, Proof Submission tests	2018-05-10 15:42:04 +05:30
Ranjith	5a8e6427f4	Tax Declaration, Proof Submission, validation	2018-05-10 15:06:49 +05:30
Ranjith	85d2d571c5	update hr menu, field subcategory in child table	2018-05-10 15:04:32 +05:30
Ranjith	e1c556b7e0	Doctype Employee Tax Exemption Sub Category	2018-05-10 15:02:57 +05:30
Ranjith	96121c598e	Tax Declaration, Proof Submission, field company	2018-05-10 15:02:00 +05:30
Nabin Hait	3881e98000	Staffing plan for group company	2018-05-08 18:36:14 +05:30
Jamsheer	4573e6609f	Leave Type - remove field is_parental_leave	2018-05-08 18:33:49 +05:30
Nabin Hait	247bd94824	Merge branch 'staffing' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-staffing	2018-05-08 16:30:18 +05:30
Nabin Hait	3e47fbb2f0	assign salary structure custom button	2018-05-08 16:05:04 +05:30
Jamsheer	bec950428c	HR Utils - Trailing whitespace	2018-05-08 12:50:14 +05:30
Jamsheer	fe882bc68a	Leave Application - Test - Leave allowed, applicable after, maximum continuos days	2018-05-08 12:36:51 +05:30
Jamsheer	3153734e7e	Leave Application - validate applicable after for leave type	2018-05-08 12:36:51 +05:30
Jamsheer	62a93533fc	Leave Policy - Validate Annual alloction for leave type	2018-05-08 12:36:51 +05:30
Jamsheer	d7bfa2303f	Leave allocation - validate max leave allocation days for a leave type	2018-05-08 12:36:51 +05:30
Jamsheer	b42f3d41ab	Compensatory Leave Request - Validate and Create leave allocation for compnsatory leave type	2018-05-08 12:36:51 +05:30
Jamsheer	b408b158dd	Leave allocation - link to leave period and compensatory leave request	2018-05-08 12:35:40 +05:30
Jamsheer	8c4386f016	Leave Type - new field is_compensatory	2018-05-08 12:35:40 +05:30
Jamsheer	c7aaf0ba67	Leave Period - Validate and Create Leave Allocation	2018-05-08 12:35:40 +05:30
Jamsheer	0e2cc5574d	HR Util methods	2018-05-08 12:35:40 +05:30
Jamsheer	9d857579af	Attendance Request - validate and create attendance	2018-05-08 12:35:40 +05:30
Jamsheer	b41baa228c	Attendance Request - link to company	2018-05-08 12:35:40 +05:30
Jamsheer	a9c82b6464	Attendance - link to attendance request	2018-05-08 12:35:40 +05:30
Shreya Shah	204c3bc37e	Remove Production Planning Tool docs (#13946 ) * Remove Production Planning Tool docs * Remove Offer Letter Occurrences * Rename Employee Loan Occurrences	2018-05-07 18:21:03 +05:30
Nabin Hait	b7613af73c	Merge branch 'enterprise_sprint' of https://github.com/frappe/erpnext into enterprise_sprint	2018-05-07 16:13:33 +05:30
Nabin Hait	330fae8652	minor fixes	2018-05-07 16:11:35 +05:30
Ranjith	c36578e8d3	Job Opening - display vacancies only on staffing plan	2018-05-07 14:19:40 +05:30
Ranjith	f220e89d9f	Job Opening - get planned opening, validate vacancies by Staffing Plan	2018-05-07 13:58:54 +05:30
Ranjith	e4cda0380a	Staffing Plan - validations, get employee count on designation change, calc estimated cost	2018-05-07 13:54:49 +05:30
Nabin Hait	fdc67a577f	Merge branch 'multi-company-transations' of https://github.com/shreyashah115/erpnext into shreyashah115-multi-company-transations	2018-05-07 13:12:16 +05:30
Ranjith Kurungadam	95c5c055f8	Optional leave (#13931 ) * Optional Holiday - move holiday list from leave type to leave period * Optional Leave - validate on Leave Application * test Optional Leaves	2018-05-07 12:43:08 +05:30
Nabin Hait	d5220c0ff4	minor fix	2018-05-07 12:22:57 +05:30
Ranjith	86b81e99e5	codacy fixes	2018-05-05 16:49:51 +05:30
Ranjith	9505ea93cf	codacy fixes	2018-05-05 14:32:42 +05:30
Ranjith	a68a108234	Employee Promotion, Transfer - test submit before date, create new employee	2018-05-05 13:43:15 +05:30
Ranjith	56b58017d1	Employee Promotion, Transfer - validate, submit, cancel workflow	2018-05-05 13:41:48 +05:30
Ranjith	fddfffd3e6	Employee Promotion, Transfer - modal to add details to child table	2018-05-05 13:27:26 +05:30
Ranjith	ea60225760	Employee Promotion, Transfer - update child table, added fields	2018-05-05 13:25:46 +05:30
Nabin Hait	abd0325acd	Fixed merge conflict	2018-05-05 12:19:14 +05:30
mnaim-cloude8	c3b4464df8	Remove unnecessary field.	2018-05-04 22:06:35 +08:00
Pawan Mehta	5e7b2eb338	Add Calendar View to Attendance doctype (#13919 ) * [fix] #13917 * codacy fixes * remove company * add status * fix date issue * code optimizations * change sql	2018-05-04 18:12:35 +05:30
Shreya Shah	eec0209e3c	Fetch mandatory reqd from server side (#13924 )	2018-05-04 17:51:10 +05:30
Suraj Shetty	00cced12a0	Success Action (#13666 ) * success action config for sales invoice * remove "Notification Control" doctype and its usage * add default success action after_install or while migration (patch) * rename for_doctype to ref_doctype * case change * minor fix * Remove unnecessary code * Replace message with translatable message * Fix 'cannot import error'	2018-05-03 19:06:32 +05:30
Saurabh	ed393d1025	[fix] consider user permissions in leave application calendar view (#13902 ) * [fix] consider user permissions in leave application calendar view * add hr settings to control leave calendar view * add patch	2018-05-03 18:52:25 +05:30
Shreya Shah	c4323cb6ba	remove set query (#13908 )	2018-05-03 16:19:56 +05:30
Shreya Shah	c10820e93e	fix error (#13907 )	2018-05-03 16:09:34 +05:30
mnaim-cloude8	e21ad0e641	Add printing details section for Job Offer. To fetch correct letter head for company selected at Job Offer.	2018-05-03 15:43:25 +08:00
Saurabh	e85a43c1c6	Merge branch 'master' into develop	2018-05-02 14:48:10 +05:30
Nabin Hait	d2861df939	Renamed Health Insurance to Employee Health Insurance	2018-05-02 14:34:14 +05:30
Nabin Hait	43274de5df	Removed employee table from Salary Structure and added employee name in all forms	2018-05-02 14:33:37 +05:30
Nabin Hait	501a64becd	Added links in HR module	2018-05-02 14:31:03 +05:30
Shreya Shah	24e8f31be1	[Enterprise] Patch and child table changes (#13656 ) * [patch] rename field * Employee Property History child table * remove child tables	2018-05-02 14:29:44 +05:30
Nabin Hait	2f77ccce1b	New doctypes for HR and Accounting (#13652 )	2018-05-02 14:27:19 +05:30
Shreya	eb54331d5f	removed color field from sales order and work order	2018-05-01 18:56:06 +05:30
Shreya	fd47b92138	renamed color field	2018-05-01 18:55:17 +05:30
Shreya	9c688f6dbf	color field for calendar in leave application	2018-05-01 18:55:17 +05:30
Shreya	d71c0c1720	color field for calendar in holiday list	2018-05-01 18:54:20 +05:30
Nabin Hait	d39386bd55	Renamed some salary related fields	2018-04-30 16:21:37 +05:30
Shreya Shah	05ad2802c6	Travis test fixes for leave application (#13790 ) * test fix * expense claim test fix * fix payroll entry test case	2018-04-30 11:14:56 +05:30
Zarrar	6bc500bffa	[Minor] Validate dates in Salary Structure (#13807 ) * validate date * fix date trigger issue	2018-04-30 11:14:09 +05:30
Nabin Hait	2f82bce387	minor fix	2018-04-26 16:32:17 +05:30
Nabin Hait	074928cf6c	Company field added in department	2018-04-26 12:16:38 +05:30
Pawan Mehta	2215d4c593	Shift Management (#13667 ) * [fix] #13634 * review_changes * rename function * rename function	2018-04-26 12:16:18 +05:30
Pawan Mehta	0a17f8d51b	remove shift schedule tool (#13658 )	2018-04-26 12:16:18 +05:30
Nabin Hait	8076d6ddc8	Renamed Health Insurance to Employee Health Insurance	2018-04-26 12:16:17 +05:30
Nabin Hait	265426a5a6	Minor fixes	2018-04-26 12:14:02 +05:30
Nabin Hait	551844881b	Removed employee table from Salary Structure and added employee name in all forms	2018-04-26 12:14:01 +05:30
Nabin Hait	f914bd374d	Added links in HR module	2018-04-26 12:13:24 +05:30
Shreya Shah	b15ef8450f	[Enterprise] Patch and child table changes (#13656 ) * [patch] rename field * Employee Property History child table * remove child tables	2018-04-26 12:13:06 +05:30
Pawan Mehta	8f14cb590c	Add grade to employee master (#13654 )	2018-04-26 12:12:45 +05:30
Nabin Hait	1c13e70d13	New doctypes for HR and Accounting (#13652 )	2018-04-26 12:12:29 +05:30
Shreya Shah	ec38044fe2	New DocTypes for HR Module (#13650 ) * New DocType Employee Incentive * New DocType Shift Type * New DocType Shift Assignment * New DocType Shift Assignment Tool * New DocType Shift Request * New DocType Salary Structure Assignment * Added Permissions * New DocType Employee Lifecycle Process * New DocType Employee Lifecycle Activity Type * New DocType Employee Lifecycle Activity * New DocType Employee Lifecycle Process Template * New DocType Employee Lifecycle Process Template Detail * Permissions and Auto Name * New DocType Staffing Plan * New DocType Staffing Plan Detail * Added fields in Job Opening * New DocType Employee Transfer * New DocType Employee Promotion * [minor]	2018-04-26 12:10:13 +05:30
Shridhar Patil	02c93a3d05	[bug] Leave application ui issues fixed (#13740 ) * validate to_date in leave application if to_date is less than from_date show message to user reset to_date value to '' * var declaration and semicolon missed * Updated popup message	2018-04-24 14:45:11 +05:30
Shreya Shah	4dc453d131	Loan Management for the Members (Non Profit Module) (#13149 ) * Renamed - Employee Loan Application to Loan Application, Employee Loan to Loan and field Employee Loan Account to Loan Account * Patch added * Dynamic link fields 'applicant' and 'applicant_type' * Member link visible only if domain non profit is active * Modified loan_dashboard * Make Repayment Entry button * Common file loan_common.js for loan and loan_application * repayment schedule rows selection in dialog * validation if repayment amount > total paid amount * repayment only if disbursement is done, make repayment by selecting the installment which falls in the current month * fetch nowdate if disbursement date not found * Rebased with develop * updated non-profit module page * updated patch for renamed fields * dialog to select repayment entries * hidden field to store reschedule paid status * update paid check in loan on journal entry updation * calculate total paid * updated docs * codacy fix	2018-04-24 12:19:36 +05:30
Shreya Shah	6db3d84cc0	remove unused code (#13765 )	2018-04-24 12:07:40 +05:30
Saurabh	2e7a45dbb4	resolved merge conflicts	2018-04-24 11:16:13 +05:30
Prateeksha Singh	c0ec3c3f7b	[fix] cal view start end date field discrepancies	2018-04-23 13:32:59 +05:30
Shreya Shah	828f5ab29e	Patch fixes (#13754 ) * reload doc * remove unused code	2018-04-23 13:21:35 +05:30
Shreya Shah	44e719d64c	[Enhancement] Leave Application and Expense Claim (#13645 ) * child table employee expense approver * set query in department * mandatory approver check in hr settings * triggers on leave and expense approver * fetch all parent approvers from department hierarchy * fixes * patch to move employee approvers from employee to department * removed hard coding of roles * modify approvers list query * commonified functions * patch * renamed standard reply occurrences * removed leave approvers table from Employee master * email templates for leave application notification * set default email templates for leave in hr settings * notify by email template * approval status in expense claim * render template in patch * removed unused code * Single child table department approver * read instead of render template	2018-04-19 20:58:52 -08:00
Saurabh	46743d00d6	Merge branch 'master' into develop	2018-04-17 12:00:21 +05:30
Saurabh	ea1408f2e0	[fix] enqueue salary slip print email after completing accounting entries (#13633 )	2018-04-15 21:38:49 -08:00
Shreya Shah	a952e40b56	fix tab (#13651 )	2018-04-13 19:33:40 +05:30
Shreya Shah	6bf4e5b73b	Department Tree (#13567 ) * Department Tree * print hide fields * create 'All Departments' as parent on setup * patch to set lft rgt * fix translatable string	2018-04-13 15:09:26 +05:30
Nabin Hait	642d39098a	Fixed merge conflict	2018-04-13 14:38:57 +05:30
Ahmed Madi	02fd6f56d6	Update leave_application.py (#13575 ) Make get_holidays function white listed	2018-04-12 13:31:50 +05:30
Pawan Mehta	f41963536e	Group email fields together and add IFSC Code (#13535 ) * [fix] #13534 * change field order cell no	2018-04-05 14:54:51 +05:30
Suraj Shetty	97d84eb509	remove apply user permission (#13505 )	2018-04-05 12:10:46 +05:30
Nabin Hait	2b682c82e8	Fixed merge conflict	2018-04-04 11:40:16 +05:30
Nabin Hait	c825e914d1	Added indexes for lft, rgt on nestedset doctypes (#13420 )	2018-04-02 10:43:46 +05:30
Shreya Shah	d021e45301	exclude current doc while validating (#13450 )	2018-04-02 10:43:19 +05:30
Shreya Shah	d17c24f969	set query in payment account (#13446 )	2018-04-02 10:13:48 +05:30
Manas Solanki	0289ad285f	fix the route filters and payment account (#13447 )	2018-04-02 10:13:22 +05:30
Shreya	9240eaa0a6	typo for accrual journal entry	2018-03-30 12:19:11 +05:30
Faris Ansari	35397a1033	Salary Register (#13367 ) - convert date range to from_date and to_date	2018-03-22 15:26:45 +05:30
Faris Ansari	4fc74333bd	Fix Icons for Expense Claim and Timesheet (#13359 )	2018-03-21 17:54:09 +05:30
Zarrar	13ddc7e188	[ Enhance ] Production to Work Order (#12902 ) * remove occurrences of Production Order * rename from report and jsons * Change Production Order to Work Order * change occurences of production order from other files * resolve minor conflict issues and reports * patch added * codacy fix * updated patches, leftover changes * rename reports, rectify patches	2018-03-20 12:38:43 +05:30
Doridel Cahanap	c893268dea	Add Health Insurance Doctype and link to Employee (#13257 )	2018-03-20 12:37:02 +05:30
Deepak kumar	656ff36c76	[Feature] Advance Account Balance in Employee Advance (#13263 ) * added due advance amount field to show due amount * fixes codacy * made whitelisted method * Update employee_advance.js	2018-03-20 12:35:02 +05:30
Prateeksha Singh	9362cf37e0	[charts] update charts API	2018-03-12 09:54:56 +05:30
Suraj Shetty	f2d28ebd6a	Data import Tool bug fix (#13165 ) * fixes #13064 * commonified naming series checks * test fixes replaced test employee names according to naming series	2018-03-09 12:33:13 +05:30
Nabin Hait	c43c95e0aa	Fixed merge conflict	2018-03-05 14:54:44 +05:30
Zarrar	950fff0ba1	changes according to the workflow (#13160 )	2018-03-05 11:30:53 +05:30
Zarrar	1e4e004667	leave application assigned by naming_series (#13158 )	2018-03-05 11:05:59 +05:30
rohitwaghchaure	0eb8bb2511	[Fix] Wrong salary slips showing when click on view salary slips from payroll entry (#13152 )	2018-03-05 11:03:27 +05:30
Nabin Hait	f68dc69078	Set auto created serial nos in incoming transactions in case of multi UOM (#13112 ) * Create user from Employee * Set auto created serial nos in incoming transactions in case of multi uom	2018-03-01 10:54:24 +05:30
tundebabzy	3fecbb98c5	Make Expense Claim from Employee Advance #13053 (#13074 ) * allow to make expense claim from employee advance * make expense claim only if claimed amount < paid_amount * expense claim made from employee advance is paid	2018-03-01 10:50:45 +05:30
Nabin Hait	a645f36b2b	Get valuation rate from historical SLE even if it is zero (#13129 ) * Don't overwrite start and end date comes from payroll entry * Get valuation rate from historical SLE even if it is zero, if records exists * Valid till should be autoset if not any default value * Set status of expense claim based on is_paid check	2018-03-01 10:31:24 +05:30
Achilles Rasquinha	646522886c	self.assertEqual	2018-02-28 21:13:51 +05:30
Shreya Shah	70a57e08fd	New Report Employee Advance Summary (#13040 ) * New Report Employee Advance Summary * JSON style column definition	2018-02-26 15:58:57 +05:30
Suraj Shetty	d3069fee4d	Daily work summary refactor (#12944 ) * added daily work summary setting doctype and code to support feature this will allow multiple setting for daily work summary * added daily work summary setting user doctype * made changes in daily work summary code * [minor] entry change in hr config file * deleted previous daily work summary settings (and its company) doctype * removed unwanted permission check * toggled read_only option for enabled field * removed print statements * add patch for the changes * doc changes * [minor] indentation fix * fixed tests * indentation fixes * codacy issue fix * formatting fixes * renamed doctype Renamed Daily Work Summary Setting to Daily Work Summary Group and did related code and doc changes * fixed typo * updated doc * codacy issue fix * [minor] renamed doctype name in json * Renamed old doctype * fixed indentation * codacy fix * indentation fix * renamed doctype * handled patch exception * fixed exception * Update daily_work_summary_group.py * rename patch file removed abbreviation in file name * handled exception in patch code * removed Unnecessary pass statement * [minor] indentation fix	2018-02-21 15:15:43 +05:30
Shreya Shah	093e7e6e98	Refactor Expense Claim (#12883 ) * patch for custom workflow * deleted field approval_status * replaced approval_status with workflow_state * updated test cases * validation to check expense approver * check if workflow_state_name already exists * fixes * modified notifications.py * removed field exp_approval and modified test cases	2018-02-16 14:49:39 +05:30
Nabin Hait	b95ecd7fcd	Gstr reports (#12940 ) * GSTR1 for B2B (#12296) * [minor] Modified GSTR1 report to identify missing GST Account in GST Settings (#12426) * [minor] Modified GSTR1 report to identify missing GST Account in GST Settings * Update gstr_1.py * GSTR1 for B2B, B2CL and B2CS (#12459) * [Report] GSTR - 1 CDNR Report (#12554) * [wip] cdnr * [WIP] cdnr with optional data * [wip] Export GSTR-1 * [minor] Minor changes in export * [new] Custom field added for GST * [fix] Minor changes in GSTR1 Report * [minor] Minor changes in gstr1 * [fix] Codacy Fixed * Update setup.py * [wip] Gstr2 * [fix] Fetch correct Tax Details * [minor] ITC data append to row * [fix] CDNR negative value * Cleanup and fixes on GSTR-2 * Minor fixes in gstr reports (#12848) * [new] B2C limit fetch from GST Settings (#12905) * [new] b2c limit fetch from gst setting * [fix] Patch Added for b2c limit * Update gstr_1.py * Update utils.py * Cusotm fields related GSTR2 * minor fixes * minor fixes * some more fixes * Added duplicate patch and some tests as not required on develop	2018-02-16 13:19:04 +05:30
Shreya Shah	394b7a2fa3	Rename Offer Letter to Job Offer (#12934 )	2018-02-16 10:49:34 +05:30
Nabin Hait	e6d65bc2a1	Fixed translations and tests (#12900 ) * Fixed translations and tests * minor fixes * minor test fixes	2018-02-14 17:44:06 +05:30
Achilles Rasquinha	361366ebe6	Python 3 fixes. (#12916 ) * Fixed iteritems and exceptions * python3-fixes * fixed iteritems	2018-02-14 17:08:59 +05:30
Saurabh	2735701aab	resolved merge conflicts	2018-02-14 11:51:09 +05:30
rohitwaghchaure	62d6593fe7	[Fix] Allow to make disbursement entry even if payment account in not set in the employee loan (#12882 )	2018-02-13 14:43:37 +05:30
Shreya Shah	d9a585bdad	Leave workflow patch fixes (#12823 ) * modified patch for leave application workflow * removed leave approval field from leave application doctype * fetch lwp and attendance only if workflow field exists * modified test cases * modified files with leave application * docstatus draft for rejected applications * modified leave application calendar * test fixed * run patch only if any record exists	2018-02-12 16:02:57 +05:30
Shreya Shah	caccd2289d	posting-date-fix (#12849 )	2018-02-12 11:34:46 +05:30
Nabin Hait	c224d34a2c	Merge branch 'master' into develop	2018-02-07 16:07:20 +05:30
Shreya Shah	80423de611	posting date in journal entry should not be nowdate (#12801 )	2018-02-07 12:08:08 +05:30
rohitwaghchaure	8df0556af5	Merge pull request #12587 from shreyashah115/leave-workflow Refactor Leave Application	2018-01-24 15:04:17 +05:30
Rushabh Mehta	b5a3df920c	[fix] primary button color for make	2018-01-23 16:08:52 +05:30
Shreya	5164997db7	delete column status	2018-01-22 14:13:03 +05:30
Shreya	dd66bc03c7	fixes	2018-01-22 12:28:38 +05:30
Shreya	fc0e8e5c6a	modified patches.txt	2018-01-22 12:26:41 +05:30
Shreya	4298bcfa40	modified leave application tests	2018-01-22 12:26:41 +05:30
Shreya	05f7e14b5a	replaced status with workflow_state	2018-01-22 12:26:41 +05:30
Shreya	d0b60e8254	set posting date only if null	2018-01-18 17:35:29 +05:30
Achilles Rasquinha	b6365b729e	Deleted Previous Chat Reference for Leave Application Approval (#12482 ) * deleted previous chat reference * txt to messge * removed comment	2018-01-15 14:12:41 +05:30
Nabin Hait	cb495fb33b	Merge branch 'master' into develop	2018-01-05 13:17:00 +05:30
Nabin Hait	28d0230e56	Multiple small fixes	2018-01-05 13:14:25 +05:30
Shreya Shah	df0dd8be5f	Travis fix for client side tests (#12224 ) * salary slip test fix * attendance tool test fix * timeout after routing	2017-12-29 14:04:46 +05:30
Shreya Shah	dd700a550f	test fixed (#12094 )	2017-12-19 11:24:07 +05:30
Shreya Shah	ec1cb79e5f	Fetch employee advance in expense claim on adding it manually (#12069 ) * added trigger on manually adding an advance * improvised the query * codacy fix * updated	2017-12-18 18:06:01 +05:30
Nabin Hait	6a640b78c4	Minor fixes in payroll entry and opening invoice tool	2017-12-15 15:34:14 +05:30
Nabin Hait	6b0d4bd01b	Minor fixes related to employee advance	2017-12-14 18:03:10 +05:30
Nabin Hait	d0249b0880	Employee advance (#11875 ) * Employee Advances against Expense Claim * added employee advance test cases and docs * Default Employee Advance Account field in company * Cleanup and fixes of employee advance	2017-12-14 13:25:57 +05:30
tundebabzy	02b4b5f526	Payroll Entry (#11936 ) (#11968 ) * add functions for tracking related salary slips * PEP 8 style * put buttons into Make based on context * add function to test for bank entry journal * refeactor `add_bank_entry_button` * "View Salary Slips" made a standalone secondary button * set_inner_btn_group for Make Bank Entry * refresh button after journal is submitted * edit javascript test case * codacy * fix as per review * no longer use $c	2017-12-14 13:15:28 +05:30
Shreya Shah	8cad3f12a2	Salary Slip not updating when adding/removing Timesheet links (#11982 ) * timesheet on salary slip * changes * cal total wages * calculate gross_pay and net_pay * codacy fix	2017-12-13 18:43:01 +05:30
tundebabzy	ff1b875661	Improve Validation Message in the Payroll Entry (#11937 ) (#11944 ) * change error message from `create_log` * PEP 8 compliance	2017-12-12 14:18:14 +05:30
Shreya Shah	6b64947f47	Route to Payment Entry instead of Journal Entry in paid Expense Claim (#11874 ) * route fixed * improvised	2017-12-08 16:14:23 +05:30
Zarrar	17fd6610dc	Fix travis (#11882 ) * fieldname wrong * bifurcated test into two - error when both were running async * minor fixes with link and route * move school domain rename up * fix async creation of operations test * edit-in-full-page is button, not link * set_route issue in production order test * minor changes * fix task tree test * more fixes * fix server side issue * improvising ui tests	2017-12-08 14:57:38 +05:30
Zarrar	5ee5d43295	ontrash of nestedset wasn't ideal for employee's usecase (#11876 )	2017-12-07 17:16:59 +05:30
Nabin Hait	97b8a7b237	Minor fixes in payroll entry	2017-12-06 19:55:57 +05:30
Shreya	e570e4a049	fixed a test	2017-12-04 16:49:44 +05:30
Shreya	f8e7bc7c5b	removed process payroll doctype	2017-12-04 16:49:44 +05:30
Shreya Shah	db332f2c08	employee_details table added	2017-12-04 16:49:44 +05:30
Shreya	9956f15c80	added py test	2017-12-04 16:49:44 +05:30
Shreya	b5dff03453	added changes from process payroll	2017-12-04 16:49:44 +05:30
Shreya	d1defa5fc7	set salary components	2017-12-04 16:49:44 +05:30
Shreya	d73dd056d6	test case	2017-12-04 16:49:44 +05:30
Shreya	7b2870431e	new doctype payroll_entry	2017-12-04 16:49:44 +05:30
Zarrar	5e470f757f	[Fix] Filter on child table not working in Calendar (#11824 ) * use the new get_events method * using the common get_events method for calendar_view * using add_fetch to fill customer_name	2017-12-04 11:22:25 +05:30
rohitwaghchaure	e34ef60e3e	[fix] Asset test cases and added make_sales_invoice (#11800 ) * [fix] Asset test cases and added make_sales_invoice * vehicle trip test cases	2017-11-30 15:59:40 +05:30
Zarrar	95ee7654a1	Employee tree (#11667 ) * nested set implemented * treeview for employee * patch added to assign lft rgt, update nsm_model on trash * call on_trash method of super class	2017-11-29 18:44:02 +05:30
Nabin Hait	ad2a3e4f38	Cleanup and fixes on delivery trip	2017-11-29 15:53:01 +05:30
Nabin Hait	46e285efe9	Merge branch 'add_delivery' of https://github.com/creamdory/erpnext into creamdory-add_delivery	2017-11-29 14:15:16 +05:30
Doridel Cahanap	de82fe9e8f	[minor] Set Rename for Training Program (#11740 )	2017-11-28 11:26:23 +05:30
creamdory	fd1503c6a5	[New Feature] Delivery	2017-11-20 10:28:49 +08:00
Nabin Hait	1c4653ed97	Merge branch 'develop' into payment-terms	2017-11-17 12:41:56 +05:30
Zarrar	24b8aa2e80	set field dependent on link field fix (#11580 )	2017-11-15 14:27:00 +05:30
Nabin Hait	6fd163bc55	Merge branch 'master' into develop	2017-11-15 14:08:17 +05:30
rohitwaghchaure	43edd5d03c	Employee loan fixes (#11495 ) * Employee loan fixes * Update update_employee_loan_details.py	2017-11-14 17:59:20 +05:30
tunde	ffa659fd2c	Merge branch 'develop' into payment-terms	2017-11-14 09:59:45 +01:00
Rushabh Mehta	d8bc8de6ca	[minor] remove unnecessary description in upload attendance, fixes #10603	2017-11-14 12:52:53 +05:30
Prateeksha Singh	17b7209032	remove erroneous column breaks (#11522 )	2017-11-10 18:54:03 +05:30
Prateeksha Singh	731b66b788	remove erroneous column breaks (#11523 )	2017-11-10 18:53:52 +05:30
rohitwaghchaure	cc97ec9202	[hotfix] Salary slip, leave considered in amount calculation even if depends on lwp is disabled in salary slip (#11507 )	2017-11-10 15:06:58 +05:30
Saurabh	62fd4007b0	Merge branch 'master' into staging	2017-11-02 12:14:42 +05:30
tunde	31287b00a6	call get_employee_loan_application only when appropriate	2017-10-31 18:10:17 +01:00
tunde	14e97ce0c8	Merge branch 'develop' into payment-terms	2017-10-26 13:35:42 +01:00
Doridel Cahanap	49a7bde6e2	[minor] Label for Training Event in Training Program Dashboard (#11280 )	2017-10-25 12:15:17 +05:30
Manas Solanki	a5eee4629f	Fix UI tests (#11309 ) * decrease the timeout * delete the duplicate test	2017-10-25 11:42:22 +05:30
tunde	c8d2361b81	Merge branch 'develop' into payment-terms	2017-10-24 12:25:29 +01:00
Doridel Cahanap	b06f155ceb	[minor] Set Quick Entry to False in Training Event (#11279 )	2017-10-23 11:35:12 +05:30
Doridel Cahanap	5a4d5bfaf2	Add Training Program DocType, Script, Path and Doc (#11181 ) * Add Training Program Doctype, Script, Config and documentation * Add Training Program to Training Event * [Test Case] Training Event in a Training Program	2017-10-20 11:31:15 +05:30
Nabin Hait	b4f5f14438	Timeout increased for setting __newname (#11252 ) * Timeout increased for setting __newname * UI test fixes * fixed ui test for PO * ui tests * ui tests * ui tests * ui tests * ui tests	2017-10-20 11:26:17 +05:30
tunde	09ce68ec19	Merge branch 'develop' into payment-terms	2017-10-19 17:47:31 +01:00
Helkyd	7ec7a45f05	Salary Detail Abbr (#11165 ) When processing via Process Salary Abbr is not filled unless if Hourly pay ... this is required for later check what Component is or was added for Employee	2017-10-18 11:16:24 +05:30
KanchanChauhan	44734049f5	[Minor] Populate Expense Claim Description from Expense Claim Type (#11156 )	2017-10-17 17:23:26 +05:30
Rushabh Mehta	bc4e2cd9c1	[added] hospitality domain (#11020 ) * [added] hospitality domain * [tests] wip * [tests] for restaurant * [fix] tests for new naming * [docs] added restaurant docs * [docs] added restaurant docs	2017-10-17 12:30:34 +05:30
Prateeksha Singh	bfb108d722	Replace c3 (#11112 ) * [charts] replace in asset.js * replace in reports	2017-10-17 12:03:02 +05:30
Saurabh	9893a2d608	Merge branch 'master' into develop	2017-10-10 11:22:39 +05:30
Saurabh	f347e23556	[fix] upload attendacne with with no_socketio param	2017-10-09 16:13:21 +05:30
tunde	e27f5dee1f	Merge branch 'develop' into payment-terms	2017-10-09 10:11:05 +01:00
Doridel Cahanap	5ba39f3f83	Add has_certificate and level fields in Training Event (#11093 )	2017-10-09 12:45:28 +05:30
tunde	1db7faa862	Merge branch 'develop' into payment-terms	2017-10-06 09:37:10 +01:00
Doridel Cahanap	5cb6c38a34	Add Calendar in Training Event Doctype (#11090 )	2017-10-06 11:50:05 +05:30
tunde	d82677f1e6	Merge branch 'develop' into payment-terms	2017-10-06 02:23:45 +01:00
Stavros Anastasiadis	455c3ebb27	Add as optional field link Company (#11068 )	2017-10-05 18:45:37 +05:30
Utkarsh Goswami	975d28307a	Payroll feature (#10900 )	2017-10-05 15:59:51 +05:30
Stavros Anastasiadis	ea390effa5	Add multirows in Attendees selection (#11067 )	2017-10-05 15:31:25 +05:30
Nabin Hait	34ad2e6a60	Use format_currency only if fieldtype is currency	2017-10-05 15:28:43 +05:30
Nabin Hait	f8ad0cbe70	Merge branch 'develop' of https://github.com/Helkyd/erpnext-1 into Helkyd-develop	2017-10-05 15:02:50 +05:30
Doridel Cahanap	25db832be1	[minor] Add "Attendance" in grid view for Training Event Employee (#11063 )	2017-10-05 14:20:43 +05:30
Nabin Hait	fc712aea32	Merge branch 'master' into develop	2017-10-04 18:05:20 +05:30
tundebabzy	65dfd09947	fix wrong variable name (#11050 )	2017-10-04 17:51:44 +05:30
KanchanChauhan	d3e21fff66	[Minor] Employee name as standard filter (#11043 )	2017-10-04 15:20:34 +05:30
Revant Nandgaonkar	4d68e03a97	[Fix] Job Opening Web Form breadcrumb (#11029 )	2017-10-04 14:35:21 +05:30
Helkyd	4c58588d25	Improve Salary Register Check if fieldname is a number to format. Start the Html Salary with hidden fields and check if they not empty and increase the width... This will remove Blank fields from the report.	2017-10-01 20:20:57 +01:00
tunde	c49e748c85	Merge branch 'develop' into payment-terms	2017-09-29 13:30:22 +01:00
Rushabh Mehta	2b87d100fa	[fix] https://github.com/frappe/erpnext/issues/10956	2017-09-28 15:21:36 +05:30
tunde	25cda29007	fix test Employee	2017-09-21 14:33:39 +01:00
Faris Ansari	aebcb17daf	Show thumbnail image in daily work summary (#10605 ) * Show thumbnail image in daily work summary * Crop thumbnail image into square * fix codacy	2017-09-18 16:58:24 +05:30
Nabin Hait	628ca2a2ec	Minor fix for ui tests	2017-09-15 19:35:12 +05:30
Nabin Hait	46941e8b35	Time out increased for appraisal template	2017-09-15 18:56:49 +05:30
Nabin Hait	43268bd350	Fixed salary structure tests	2017-09-14 19:39:10 +05:30
Nabin Hait	2f64f0f5fa	Fixed salary structure tests	2017-09-14 19:08:15 +05:30
Nabin Hait	427172c941	Update test_salary_structure.js	2017-09-14 17:57:21 +05:30
Nabin Hait	092f6d3739	Fixes ui tests	2017-09-14 16:45:47 +05:30
Nabin Hait	de9eebe51c	Fixed multiple ui tests	2017-09-12 15:40:33 +05:30
Rushabh Mehta	2e8e5354e9	[fix] trainig_feedback.py	2017-09-07 10:43:36 +05:30
Rushabh Mehta	290e066633	[rename] /test_training_event_attendance.js	2017-09-07 09:07:15 +05:30
Nabin Hait	baacf51a00	Fixed merge conflict	2017-09-04 10:13:29 +05:30
Nabin Hait	d7ff9dca1d	Fixed rounding issue in Process Payroll, fixes #9300 (#10586 )	2017-08-31 15:17:01 +05:30
Aditya Hase	6ccb6562f1	Python 3 compatibility syntax error fixes (#10519 ) * Use Python 3 style print function * Use 'Exception as e' instead of 'Exception, e' * Unpack tuple arguments explicitly in instead of relying on auto unpacking * Use consistent indentation * Use 0 if stock_frozen_upto_days is None	2017-08-28 18:17:36 +05:30
Utkarsh Goswami	7ba2a83182	Tests for Loan (#10557 )	2017-08-28 11:13:16 +05:30
Utkarsh Goswami	579c8e68f9	Tests for Expense Claims [HR] (#10514 )	2017-08-25 16:12:49 +05:30
Utkarsh Goswami	9a04da27b0	Test for training (#10545 )	2017-08-25 12:01:04 +05:30
Utkarsh Goswami	3da5574d79	Test for appraisal (#10525 )	2017-08-24 15:48:57 +05:30
mbauskar	62f0722325	resolved merge conflicts	2017-08-21 08:58:42 +05:30
Vishal Dhayagude	8fd5b325e0	[UI Test] travis.yml modified for fresh UI Test (#10446 ) * [UI Test] travis.yml modified for fresh UI Test * [fix] travis * Update test_production_order.js * Update test_production_order.js * Update test_purchase_order_receipt.js * Update tests.txt * Update test_purchase_order_receipt.js	2017-08-20 10:59:48 +05:30
Utkarsh Goswami	5a27aead06	Test for Process Payroll (#10447 )	2017-08-18 13:12:53 +05:30
Utkarsh Goswami	ca63cc6439	[UI Test Recruitment] To test Recruitment in HR module (#10441 ) * Tests for Recruitment * Codacy fix	2017-08-18 11:57:01 +05:30
Makarand Bauskar	446c2b0e91	[hotfix] fixes for https://github.com/frappe/erpnext/issues/9782 calculate leave without pay before subtracting holidays (#10355 )	2017-08-17 12:39:35 +05:30
Utkarsh Goswami	44b088c6b3	[UI Test Salary] To test the salary structure and the salary slip (#10407 ) * Test for salary structure and salary slip * Test for salary structure and salary slip * Test for salary structure and salary slip * Travis CI fixes * Updated * Updated * travis fixes * Travis fixes	2017-08-16 11:32:04 +05:30
Rushabh Mehta	683b015951	[fix] email alert	2017-08-14 15:03:33 +05:30
Makarand Bauskar	e5ae4d3bd3	send email via the background jobs (#10374 ) (#10393 ) * send the email via the background worker in the payment request (#10350) * send email via the background jobs (#10374)	2017-08-14 12:22:50 +05:30
Rushabh Mehta	1132502e14	[fix] test	2017-08-14 12:09:30 +05:30
Rushabh Mehta	ea573e2421	[training] update names	2017-08-14 11:53:34 +05:30
Rushabh Mehta	550b0fab84	[fixes] email notifications by email alert on training event and result	2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott	35a4e587ee	Fixes for camel_case and translations	2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott	e92b4737e3	codacy fixes	2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott	e9dbafcc10	Improve email format for training event, add ui test	2017-08-14 11:53:34 +05:30
Manas Solanki	a5cb9ae8bd	send email via the background jobs (#10374 )	2017-08-14 09:50:15 +05:30
mbauskar	2fa8af3b02	Merge branch 'master' into develop	2017-08-14 09:31:01 +05:30
Makarand Bauskar	aac8349391	[hotfix] remove the white spaces from condition and formula fields (#10331 ) * [hotfix] remove the white spaces from condition and formula fields * [tests] added tests cases for whitespaces in formula and condition fields	2017-08-10 11:25:49 +05:30
Manas Solanki	a854ea00a5	mark holiday in the employee monthly attendance sheet (#10349 )	2017-08-10 11:20:58 +05:30
mbauskar	cce79255fe	resolved merge conflicts	2017-08-04 11:07:49 +05:30
Nabin Hait	21045c456e	Update process_payroll.py	2017-08-03 10:20:10 +05:30
tunde	919c9db1b0	indicator should be red	2017-08-02 15:19:24 +01:00
tunde	3b8b3fe766	Merge branch 'hotfix' into issue-10215	2017-08-02 14:27:56 +01:00
tunde	85adbd7eae	show message if there's no submitted salary slip	2017-08-02 14:20:24 +01:00
tunde	c697526382	except in python 3 compatible style	2017-08-02 14:20:23 +01:00
Nabin Hait	9641d5b1f4	Make payment entry button in expense claim and some minor cleanup	2017-08-01 17:38:48 +05:30
Ben Cornwell-Mott	38d4be8325	Update manuals. Fix codacy issues	2017-08-01 17:38:47 +05:30
Ben Cornwell-Mott	118ceda46f	Add Payment Entry for Expenses	2017-08-01 17:35:50 +05:30
Utkarsh Yadav	8990af458b	[ui test] leave application in HR (#10151 ) * added test for leave application * minor changes and path added * travis fixes * minor changes	2017-07-28 19:37:15 +05:30
Utkarsh Yadav	1c8d8a9720	[ui test] leave type,leave control panel and leave allocation in HR (#10136 ) * changes in attendance * added test for leave type * added test for leave control panel * added test for leave allocation * codacy fixes	2017-07-28 11:40:29 +05:30
Saurabh	c07741d36f	Merge branch 'master' into staging	2017-07-27 17:50:28 +05:30
mbauskar	7b764d03c2	Merge branch 'master' into develop	2017-07-27 12:18:15 +05:30
Utkarsh Yadav	b8b01928d3	[ui test] employee attendance tool and attendance in HR (#10112 ) * added test for attendance tool * added test for attendance * minor changes * minor changes * path added in tests.txt * codacy fixes	2017-07-27 11:49:10 +05:30
tundebabzy	84227a6c54	Employee Loan Should Be Limited To Employee Company (#10039 ) (#10093 ) * filter employee drop down by company name * codacy fix	2017-07-27 11:47:03 +05:30
tundebabzy	87ec6a12ef	adds options to currency fields (#10118 )	2017-07-27 11:38:17 +05:30
cclauss	6848708377	old style exception, raise --> new style for Python 3 (#10082 ) * old style raise --> raise() for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style raise --> raise() for Python 3 * old style raise --> raise() for Python 3 * old style exception, raise --> new style for Python 3	2017-07-27 10:38:35 +05:30
Utkarsh Yadav	53b877bd8f	[ui test] Employee in HR (#10103 ) * added test for employee * names changed * path added in tests.txt	2017-07-26 16:32:16 +05:30
Utkarsh Yadav	b8a4a584e6	[ui test] test for department, designation, company and leave block list (#10085 ) * added test for required items * minor fixes for travis * name changed * added test for employment type * travis fixes	2017-07-26 13:14:34 +05:30
Utkarsh Yadav	20a862a6b9	[ui test] holiday list and branch in HR (#10045 ) * added test for holiday list * codacy fixes * added check for all days in list * added test for branch * codacy fixe * minor fixes	2017-07-24 14:33:42 +05:30
mbauskar	0e6933a1e8	resolved merge conflicts	2017-07-20 14:19:47 +05:30
tundebabzy	11d23f84d7	Can't set Start and End Dates in Salary Slip (#9513 ) (#9944 ) * remove trigger from end_date * adds new function `get_end_date`: - it tries to calculate the appropriate end date for a given frequency - returns an empty string if frequency is 'biweekly' - adds test cases * changes logic in `set_start_end_dates`: - if start_date is empty in form, call process_payroll.get_start_end_dates - else, call process_payroll.get_end_date * `get_end_date` should return a dict * changed "biweekly" to "bimonthly" * change the behaviour of process payroll start and end date: - when payroll frequency is changed, change start/end date as usual - if start date is manually changed, use the frequency to calculate the end date * clean up * further cleanup * in `get_end_date`, if `frequency` isn"t given, "monthly" * remove end_date from cscript and introduce `set_end_date` * fix tests * removed whitespaces	2017-07-20 10:33:03 +05:30
rohitwaghchaure	f86100a734	[Fix] Calendar view not working for leave application (#9963 )	2017-07-19 17:09:30 +05:30
Makarand Bauskar	c446bf6117	Merge branch 'develop' into rejected_expense_claim_issue	2017-07-18 10:54:13 +05:30
Rushabh Mehta	660de515b5	[fix] filters for calendars frappe/erpnext#9850 (#9870 )	2017-07-18 10:50:30 +05:30
Rohit Waghchaure	0e376a464b	test cases	2017-07-17 16:47:01 +05:30
Rohit Waghchaure	8333b5754b	[Fix] Expense claim status issue	2017-07-17 16:38:20 +05:30
rohitwaghchaure	b994b3dcda	Allow to select asset account in the payable in the expense claim for imprest management (#9891 )	2017-07-17 14:33:33 +05:30
mbauskar	ed89a83584	[minor] don't trigger the expense type trigger if value is not set	2017-07-14 11:21:27 +05:30
Faris Ansari	2c5b3e83f5	New design for daily work summary (#9844 ) * New design for daily work summary * Update tests	2017-07-13 18:37:18 +05:30
Rushabh Mehta	4a7b4efbec	[tests] update travis.yml to run ui-tests (#9748 ) * [tests] update travis.yml to run ui-tests * [tests] update travis.yml to run ui-tests * [test] fix item_group.py * [test] fix item_group.py * [check] daily work summary fails? * [check] daily work summary fails? * [check] daily work summary fails? * [check] daily work summary fails? * [check] daily work summary fails? * [check] daily work summary fails? * [check] no scheduled jobs for tests * [check] daily work summary fails? * [check] daily work summary fails?	2017-07-10 23:00:01 +05:30
Makarand Bauskar	cdfccffc0d	Merge pull request #9341 from manassolanki/training-event send email on update and on update after submit	2017-06-21 19:09:21 +05:30
Rushabh Mehta	b7b49f6da7	[fixes] fix message and type conversion;	2017-06-19 09:59:09 +05:30
Manas Solanki	9936100a6a	send email on update and on update after submit fixes #8898	2017-06-16 22:18:20 +05:30
Vishal Dhayagude	2510d1c86a	Training Events/Results link added to Employee (#9313 )	2017-06-16 11:58:08 +05:30
Manas Solanki	b07535bb64	bug in training result module (#9314 )	2017-06-16 11:20:42 +05:30
mbauskar	f9e2bf1ab4	fixed merge conflicts	2017-06-15 13:42:47 +05:30
tundebabzy	f5604c101c	Once primary key is generated, do not allow changing Series #8911 (#9265 ) * changes set_only_once field for tabDocField to 1 * changes all affected doctypes `set_only_once` option to 1 * add patch name to text file * adds test cases * Revert "add patch name to text file" This reverts commit fc7cb6b4557217cee61abfbbf42ff6f40099f23c. * Revert "changes set_only_once field for tabDocField to 1" This reverts commit 2b1f7f31a0d6491056d809f319bae0f7b84be435.	2017-06-14 16:10:09 +05:30
KanchanChauhan	1dc26b127b	Salutation and Gender in Lead and Customer (#9199 )	2017-06-13 15:26:35 +05:30
Nabin Hait	a128b21baa	Fixed merge conflict	2017-06-07 12:17:17 +05:30
tundebabzy	f981eee221	fixes issue #9013 : Salary calculation Error. (#9044 ) * fixes issue #9013: Salary calculation Error. * adds test case for scenario as in #9013	2017-06-07 12:05:00 +05:30
Faris Ansari	5f27c94100	Merge pull request #9078 from netchampfaris/remove-globals Lint and fix JS files	2017-06-06 11:35:42 +05:30
rohitwaghchaure	7f2513f7a1	[Fix] Employees working on a holiday report's date filter not working (#9108 )	2017-06-01 18:57:34 +05:30
Manas Solanki	5995010007	Correction in the validation message (#9079 )	2017-05-30 15:56:48 +05:30
bcornwellmott	0d38a6b495	Fix grammar error in HR Training Results (#9076 ) * Fix Typo in message Issue #9074 * Added condition for notifying user of grade.	2017-05-30 15:56:02 +05:30
Manas Solanki	ca31425bb4	field for the naming series should have no copy attribute (#9067 )	2017-05-30 15:36:50 +05:30
Faris Ansari	ab74ca7fff	Lint and fix JS files	2017-05-30 12:54:42 +05:30
Makarand Bauskar	157c334737	[minor] added get_terms methods to erpnext.utils so that it can be used in non transactional documents (#9037 )	2017-05-26 21:32:33 +05:30
Manas Solanki	c2bf50042f	validate email id only if provided (#9020 )	2017-05-25 14:14:42 +05:30
Francisco Roldán	85bfc05efa	Fix missing translations (#8871 ) * Fix missing translations * Fix	2017-05-17 19:42:04 +05:30
Ayush Shukla	c55b805b66	[minor] process_payroll_create salary fixed, fixes frappe/erpnext#8853 (#8881 ) * [minor] process_payroll_create salary fixed * [minor] indentation fix	2017-05-17 19:18:26 +05:30
Makarand Bauskar	3e2c9d00f1	[minor] Corrected field label & placed Expense Claim button in Next Step (#8828 )	2017-05-16 08:22:45 +05:30
KanchanChauhan	f74010d379	Calculations based on working and payment days should be made if salary structure exists (#8770 )	2017-05-11 11:42:35 +05:30
KanchanChauhan	323e46ba5a	Added parent filter to the Salary Structure Employee since it was getting base and variable value from first found Salary Structure Employee (#8756 )	2017-05-10 17:46:32 +05:30
Makarand Bauskar	486045e1d1	[minor] check if date of joining is available before creating Salary Slip (#8700 )	2017-05-06 12:47:42 +05:30
Nabin Hait	3ce41d6b1f	Fixed related to auto fetching batch nos and date valiation in salary structure (#8666 ) * Fixed related to auto fetching batch nos and date valiation in salary structure * Update get_item_details.py	2017-05-03 18:22:24 +05:30
Nabin Hait	504eba7fb2	Test case fixed for Employee Loan Application	2017-05-02 18:19:48 +05:30
Nabin Hait	e15721df48	Caluculate total interest and payable amount in Loan Application if fixed amount per period	2017-05-02 18:19:48 +05:30
Nabin Hait	2afb9b96cd	pricing rule fix	2017-04-28 15:20:49 +05:30
mbauskar	9cf6d630e9	[minor] fixes for expense claim status	2017-04-25 13:15:50 +05:30
ibi	83c1c3a171	fleet_management: replace references to fleet_management by hr in vehicle_log doctype	2017-04-21 17:57:07 +05:30
mbauskar	5123a8519b	[minor] check if joining date is available before validating attandance date	2017-04-18 11:08:57 +05:30
Rushabh Mehta	e3c117e32c	[fix] validate preferred email if set in employee.py	2017-04-15 16:59:39 +05:30
Nabin Hait	f6149f1507	Merge pull request #8429 from ckosiegbu/payroll_updates Statistical Components for Salary Structure	2017-04-13 18:48:47 +05:30
Nabin Hait	2f3585f949	Update salary_slip.js	2017-04-13 18:47:25 +05:30
ckosiegbu	a236f4e586	Space to Tabs on salary_slip.py	2017-04-13 10:28:10 +01:00
ckosiegbu	64f29f819a	Introduce the ability to specify in a Salary Structure that a component is statistical. This allows components to be used in calculations without being added/deducted from earnings deductions.	2017-04-13 00:00:37 +01:00
Khairil Zhafri	417145bec5	Update employee.json Less binary gender options for Employee	2017-04-11 18:55:20 +05:30
Rohit Waghchaure	1ff1368280	[fix] Vehicle expense report not working	2017-04-11 18:54:32 +05:30
mbauskar	236f7aac7f	[minor] track changes for transaction documents	2017-04-10 14:48:54 +05:30
Rushabh Mehta	9365641777	[added] frappe.safe_eval	2017-04-06 18:24:34 +05:30
Kanchan Chauhan	aa6f00c403	Added default 'All' option to filters to differentiate all and empty filter	2017-04-06 15:22:18 +05:30
Rushabh Mehta	08a42e00ae	[fix] salary slip eval, remove access to globals, #8313	2017-04-05 14:52:22 +05:30
Rushabh Mehta	cc8b2b2fdb	[fix] [refactor] demo for v8 and remove purchase common	2017-03-31 17:36:48 +05:30
Rushabh Mehta	dc89916aa9	[fix] salary component fix for abbr	2017-03-31 17:20:57 +05:30
Nabin Hait	eb6fa5b70c	Update attendance.py	2017-03-30 14:11:47 +05:30
Nabin Hait	1f6bd0ad37	Fixed merge conflict	2017-03-30 13:15:22 +05:30
Nabin Hait	a24f8dbb8f	Merge branch 'develop' into update-disbursment-date	2017-03-30 13:06:28 +05:30
Kanchan Chauhan	37d8f643cc	Read permissions to Employee on Employee Loan and Loan Type	2017-03-30 13:05:49 +05:30
Kanchan Chauhan	400c6f5aef	Disbursement Date fetched from JV - Employee Loan	2017-03-30 13:04:05 +05:30
mbauskar	07e6bdd4f2	[minor] check employee date of joining before marking the employee attendance	2017-03-30 12:52:29 +05:30
Kanchan Chauhan	b87c174898	Employee Loan Dashboard	2017-03-30 12:51:46 +05:30
Kanchan Chauhan	5ac740b3cb	[Fix] From Date and To Date not to be auto calculated for Timesheet Salary	2017-03-30 12:44:28 +05:30
Kanchan Chauhan	35b12e2ea6	Company in Leave Control Panel	2017-03-29 17:30:56 +05:30
Nabin Hait	8de911b5b4	Merge pull request #8086 from KanchanChauhan/read-perm-to-guest [Minor] Guest should have read permissions on Job Openings	2017-03-23 16:50:45 +05:30
Kanchan Chauhan	076e9d6af8	[Minor] From date, To date based on Payroll Frequency	2017-03-22 16:07:03 +05:30
Kanchan Chauhan	730ad5a507	[Minor] Guest should have read permissions on Job Openings	2017-03-22 12:37:38 +05:30
Nabin Hait	ee7b4f2882	Merge pull request #8016 from rmehta/posting-date-option [feature] posting date, time is always current unless explicitly set	2017-03-15 11:22:04 +05:30
Nabin Hait	3d731df7e3	Field order changed for 'Qty as per Stock UOM'	2017-03-14 17:24:57 +05:30
Rushabh Mehta	6d4a52562b	[fix] posting date, time is always current unless explicitly set	2017-03-14 17:06:51 +05:30
Nabin Hait	6923397ef6	Show net total in salary slip log in Process Payroll. Fixed #7986	2017-03-12 16:55:05 +05:30
Nabin Hait	c5204f56e2	Merge pull request #7909 from KanchanChauhan/employee-loan-jv JV on submitting Employee Loan	2017-03-12 16:50:48 +05:30
Nabin Hait	132193309c	Merge pull request #7952 from KanchanChauhan/multiple-salary-fixes Multiple Salary Fixes	2017-03-12 16:48:11 +05:30
Kanchan Chauhan	37a57813fa	Multiple Salary Fixes	2017-03-09 13:00:35 +05:30
Kanchan Chauhan	ffd1f112e6	JV on submitting Employee Loan	2017-03-09 12:21:37 +05:30
Kanchan Chauhan	a64f53801b	[Minor] Label change in Expense Claim	2017-03-08 16:59:49 +05:30
Abdulla P I	cbe035b08a	Only enabled user to be fetched	2017-03-07 13:34:08 +05:30
Nabin Hait	b3ffd6b282	Merge pull request #7828 from rohitwaghchaure/update_user_roles_to_roles Changed userrole to has role, commonify role editor of the user	2017-03-06 18:44:53 +05:30
Kanchan Chauhan	8411be7720	[Fix] Candidate can apply to multiple jobs	2017-03-06 14:40:43 +05:30
Rohit Waghchaure	e7485150a1	added roles in the report	2017-03-06 14:26:09 +05:30
Rohit Waghchaure	312498060f	changed doctype name userrole to has role	2017-03-06 14:24:39 +05:30
Rohit Waghchaure	d59f8b32cd	changed user_roles to roles	2017-03-06 14:24:39 +05:30
Rohit Waghchaure	f8aa6ed46b	removed fiscal year and month from the print	2017-03-02 17:51:15 +05:30
Nabin Hait	a0fb3e5128	Merge pull request #7888 from KanchanChauhan/payroll-fix [Fix] JV entry for Employee Loan only if Loan exists	2017-03-02 14:15:59 +05:30
Kanchan Chauhan	cfb0adff98	[Minor] Removed Paid status from Salary Slip	2017-03-02 12:59:35 +05:30
Kanchan Chauhan	e6254b96c4	[Fix] JV entry for Loan only if Loan exists	2017-02-28 17:42:09 +05:30
Nabin Hait	631ecad985	Merge pull request #7875 from KanchanChauhan/employee-loan-fixes [Fix] Multiple fixes in Employee Loan	2017-02-27 17:28:20 +05:30
Nabin Hait	3ddc26060a	Merge pull request #7876 from KanchanChauhan/salary-slip-fix [Fix] Update totals on salary component deletion	2017-02-27 17:26:39 +05:30
Kanchan Chauhan	c02745c826	[Fix] Update totals on salary component deletion	2017-02-27 17:21:41 +05:30
Kanchan Chauhan	a13adc0e6b	[Fix] Multiple fixes in Employee Loan	2017-02-27 16:56:00 +05:30
Nabin Hait	c642f76a4d	Fixed merge conflict	2017-02-27 14:40:53 +05:30
Nabin Hait	697150f339	Leave application overlap validation for half day and test cases	2017-02-24 18:53:34 +05:30
Kanchan Chauhan	26b79f108a	Leave Application Enchancement	2017-02-24 15:13:06 +05:30
Nabin Hait	8ec1b565f5	Merge pull request #7823 from KanchanChauhan/payroll-currency [Minor] Company default currency in Salary Slip and Structure	2017-02-23 16:52:23 +05:30
Kanchan Chauhan	52a5cb9ae3	[Fix] Holiday Calendar Fix	2017-02-23 16:15:12 +05:30
Nabin Hait	60db08fd7f	Merge pull request #7817 from KanchanChauhan/loan-management-fix [Minor] Field label rename	2017-02-23 16:09:11 +05:30
Kanchan Chauhan	951e31667b	[Minor] Company default currency in Salary Slip and Structure	2017-02-23 11:16:53 +05:30
Nabin Hait	97b3be6f9d	Update salary_structure_employee.json	2017-02-23 11:10:05 +05:30
Nabin Hait	5079c9ef47	Fixed merge conflict	2017-02-22 15:31:31 +05:30
Kanchan Chauhan	6af7140763	[Minor] Field label rename	2017-02-22 14:58:34 +05:30
Nabin Hait	7056ce54d7	Update salary_structure.py	2017-02-20 23:28:47 +05:30
Nabin Hait	6a85752ead	Merge branch 'hotfix' into remove-joining-datep-validation	2017-02-20 19:31:38 +05:30
Nabin Hait	e17519accb	Update salary_structure.py	2017-02-20 19:30:44 +05:30
Nabin Hait	8bb69ff8bf	Fixed merge conflict	2017-02-20 19:01:04 +05:30
Nabin Hait	e49d901907	Update process_payroll.py	2017-02-20 18:36:12 +05:30
Nabin Hait	fd3ec066ce	Added fields in global search	2017-02-20 13:38:31 +05:30
Kanchan Chauhan	1b204c8e4e	Accrual Payroll System	2017-02-16 16:30:51 +05:30
Nabin Hait	507e6fa46e	Merge pull request #7749 from KanchanChauhan/leave-application-cleanup Rejected leave application can be submitted	2017-02-16 14:19:11 +05:30
Kanchan Chauhan	11f159193e	Rejected leave application can be submitted	2017-02-15 19:09:21 +05:30
Kanchan Chauhan	ecdcac1fdf	[Fix] Empty row in Goals of Appraisal fixed	2017-02-14 15:32:06 +05:30
Nabin Hait	6ff0caa87a	Fixed merge conflict	2017-02-08 11:33:33 +05:30
Kanchan Chauhan	842ad55235	[Fix] Employee Details in Salary Slip preview	2017-02-07 12:07:55 +05:30
Kanchan Chauhan	5f5457085e	Joining date validation removed from Salary Structure	2017-02-06 14:50:39 +05:30
Nabin Hait	20d2d7548a	Update salary_component.js	2017-02-06 11:36:38 +05:30
KanchanChauhan	6575a0a7e2	[Minor]ROI fix in Employee Loan (#7643 )	2017-02-02 16:01:43 +05:30
Kanchan Chauhan	3e2ecc3423	[Fix] Account filter in Process Payroll and Salary Component	2017-02-02 14:41:48 +05:30
Nabin Hait	c62362f064	Merge pull request #7649 from KanchanChauhan/salary-struct-fix [Fix] Employee name fixes in Salary Structure	2017-02-02 13:30:05 +05:30
Kanchan Chauhan	a0314f19ca	[Fix] Employee name fixes in Salary Structure	2017-02-02 12:56:56 +05:30
KanchanChauhan	b499fe91fa	Revert "[Fix] Rate of Interest Fix"	2017-02-01 18:16:35 +05:30
KanchanChauhan	929c3890a4	Merge pull request #7641 from KanchanChauhan/employee-loan-fix [Fix] Rate of Interest Fix	2017-02-01 18:06:32 +05:30
KanchanChauhan	0e995adc44	Salary Structure Employee custom field can be used in Formula and Condition (#7615 )	2017-02-01 18:05:57 +05:30
Kanchan Chauhan	f01c1c2a9d	[Fix] Rate of Interest Fix	2017-02-01 18:05:26 +05:30
KanchanChauhan	3dc96cf71e	Merge pull request #7640 from KanchanChauhan/remove-date-validation-salary-structure [Minor] From Date validation removed from Salary Structure	2017-02-01 17:42:18 +05:30
Kanchan Chauhan	e67e2e6fee	[Minor] From Date validation removed from Salary Structure	2017-02-01 17:41:36 +05:30
rohitwaghchaure	ea092a7b24	[Enhancement] Booking of an employee's expense claim (#7267 ) * [Enhancement] Auto book of an employee's expense claim * test cases * documentation * fixes and changes * removed payable from employee and added into the company * Added party in account, patch to update party type for customer and supplier accounts * added party type in erpnext, fix patch * fixed travis	2017-02-01 12:02:08 +05:30
Rushabh Mehta	99ce531beb	[minor] css for team updates	2017-02-01 11:46:47 +05:30
Rushabh Mehta	7ec4b717ed	[feature] added team updates page	2017-01-31 11:42:58 +05:30
KanchanChauhan	fbaa6197f9	Employee Loan Management (#7126 ) * [WIP] Employee Loan Management * EMI calculation * Fixing PR	2017-01-30 15:15:58 +05:30
Kanchan Chauhan	e877ecfb7b	[Fix] Permissions to view Leave Balance Report	2017-01-27 11:53:56 +05:30
Nabin Hait	349d520ae2	Fixed merge conflict	2017-01-20 15:44:35 +05:30
robert schouten	e14e042f2f	[fix] remove invalid parameter from leave allocation	2017-01-20 15:02:00 +08:00
Nabin Hait	dd839055e3	Fixed merge conflict	2017-01-17 15:52:56 +05:30
Kanchan Chauhan	653303180a	[Minor] Payroll Fix	2017-01-17 13:54:55 +05:30
Nabin Hait	7c7b3c0ab4	Merge pull request #7465 from KanchanChauhan/attendance-enhancement [Enhancement] Attendance Module	2017-01-17 11:47:02 +05:30
Nabin Hait	2dab8809e7	Merge pull request #7509 from kickapoo/develop Add Full Name as option in HR Setting Employee creation option	2017-01-17 11:26:25 +05:30
Stavros Anastasiadis	241e478dc0	Add Full Name as option in HR Setting Employee creation option	2017-01-16 14:02:28 +02:00
Kanchan Chauhan	f80c2b9606	Fleet management moved to HR	2017-01-16 14:38:24 +05:30
Nabin Hait	ba2a76cfb7	Merge pull request #7453 from KanchanChauhan/salary-register-report Changes to Salary Register	2017-01-13 11:51:48 +05:30
Nabin Hait	007c87ea63	Merge pull request #7440 from nabinhait/gle_repost_optimization Optimization to reduce GLE reposting time for future stock transactions	2017-01-13 11:33:42 +05:30
Kanchan Chauhan	7933eb685c	[Enhancement] Attendance Module	2017-01-12 17:24:53 +05:30
Kanchan Chauhan	2f3ae914a6	Changes to Salary Register	2017-01-11 19:45:01 +05:30
RicardoJohann	7182de7684	allowed rename salary structure	2017-01-11 06:28:59 -02:00
Nabin Hait	51d45d8bce	Fixed merge conflict	2017-01-10 12:32:01 +05:30
Kanchan Chauhan	2b41f9d548	[Fix] Payroll Frequency toggle fix	2017-01-09 18:43:52 +05:30
Rushabh Mehta	8b133ac087	[minor] [tests] fix, tests will fail on the 5th of a month!	2017-01-06 17:21:04 +05:30
Kanchan Chauhan	b7cc393eb8	Email ID renamed to Email Address	2017-01-03 16:45:38 +05:30
Nabin Hait	ab42fc006f	Merge branch 'master' into develop	2017-01-02 17:26:55 +05:30
Kanchan Chauhan	5594050104	[Fix] Attendance validation in Leave Application	2017-01-02 11:14:44 +05:30
KanchanChauhan	4601fdd98d	Better Salary Slip logs in Process Payroll (#7322 )	2016-12-30 16:26:55 +05:30
Nabin Hait	9784d27317	Optimization to reduce GLE reposting time for future stock transactions	2016-12-30 16:21:35 +05:30
Nabin Hait	e97d40806f	Merge branch 'master' into develop	2016-12-30 14:56:20 +05:30
Kanchan Chauhan	7b29dc7208	[Fix] Monthly Salary Register Fix	2016-12-30 12:36:00 +05:30
Nabin Hait	58291c77e9	Fixed version conflict	2016-12-23 17:43:42 +05:30
Nabin Hait	c2d66bdfb2	Merge branch 'master' into develop	2016-12-23 16:45:09 +05:30
Rohit Waghchaure	1af1a43616	[Enhancement] Setting to maintain the work hours and bill hours same on the timesheet	2016-12-21 19:19:16 +05:30
Kanchan Chauhan	58ed0c6efa	Create User button in Employee if no User ID selected	2016-12-21 16:18:59 +05:30
Rushabh Mehta	2a86c32267	[minor] [patch] remove icon if present, fixes #6949	2016-12-20 12:20:39 +05:30
Rushabh Mehta	827588adf2	[minor] fixes to job opening	2016-12-19 17:06:26 +05:30
Rushabh Mehta	c3d8479443	[minor] allow website user to be selected as employee	2016-12-19 12:32:11 +05:30
Rohit Waghchaure	61fb496be6	[Fix] Test case	2016-12-16 12:19:56 +05:30
Nabin Hait	f02f1bb0c7	Added standard filters	2016-12-15 14:57:20 +05:30
Rushabh Mehta	01fab2ae1c	[minor] fix salary slip test	2016-12-15 11:43:29 +05:30
Rushabh Mehta	e9d9b8e6f0	[fix] demo and process payroll for demo (#7224 ) * [fix] demo and process payroll for demo * [fix] set payroll dates	2016-12-15 11:27:35 +05:30
Nabin Hait	1ae8e2c8fa	Revert "Revert "email cc test fixes for frappe/frappe#2441"" (#7232 )	2016-12-15 11:27:02 +05:30
Rushabh Mehta	9b049ee154	Revert "[Fixes]Payroll Fixes" (#7225 )	2016-12-14 18:25:11 +05:30
Nabin Hait	42b6e37d15	Merge pull request #7216 from KanchanChauhan/salary-fixes [Fixes]Payroll Fixes	2016-12-14 16:20:08 +05:30
Kanchan Chauhan	c292dd7213	[Fixes]Payroll Fixes	2016-12-14 15:50:54 +05:30
Nabin Hait	36f5471bab	Merge pull request #6855 from neilLasrado/training [new Feature] Added Training Module	2016-12-14 12:51:51 +05:30
Nabin Hait	44cdbbe346	Merge pull request #7203 from KanchanChauhan/employee-permissions [Minor] Read permissions to Employee on Activity Type and Appraisal Template	2016-12-14 12:50:54 +05:30
Neil Trini Lasrado	6a2fa29b4a	Fixes for training Module	2016-12-14 12:08:28 +05:30
Neil Trini Lasrado	984ee372e8	[new Feature] Added Training Module	2016-12-13 15:42:12 +05:30
Nabin Hait	201af80706	Fixed merge conflict	2016-12-13 14:30:32 +05:30
Kanchan Chauhan	b79aa1d091	[Minor] Read permissions to Employee on Activity Type and Appraisal Template	2016-12-13 14:16:57 +05:30
Nabin Hait	8ecc14b7bd	Revert "email cc test fixes for frappe/frappe#2441"	2016-12-13 14:11:49 +05:30
Kanchan Chauhan	d917b66a31	[Fix] Salary Slip test cases fix	2016-12-13 12:12:49 +05:30
Nabin Hait	ee877fd631	Merge pull request #7199 from RobertSchouten/email_cc_dev email cc test fixes for frappe/frappe#2441	2016-12-13 11:31:06 +05:30
robert schouten	3d22eb1d59	email cc test fixes for frappe/frappe#2441	2016-12-13 11:32:09 +08:00
Kanchan Chauhan	f0b0db444d	Added Is Active to Sales Person	2016-12-12 19:12:41 +05:30
Kanchan Chauhan	0ece9e0e2e	[Fix] Salary Slip Test cases fix	2016-12-08 17:02:36 +05:30
Kanchan Chauhan	f7b25cbb6b	[WIP] Payroll Updates	2016-12-08 12:20:20 +05:30
Nabin Hait	5c18bd9b61	Fixed merge conflict	2016-12-06 16:16:58 +05:30
Nabin Hait	45fda8a257	Merge pull request #7149 from KanchanChauhan/salary-slip-validation-in-leave [Minor] Validation fixes in Leave Application and Monthly Salary Register Fix for other laguages	2016-12-06 16:01:38 +05:30
Nabin Hait	67d226f491	Merge pull request #7127 from KanchanChauhan/salary-slip-fix [Fix] lwp issue fixed for salary slip without salary structure	2016-12-06 15:48:47 +05:30
Nabin Hait	9313a7408c	Merge pull request #7144 from rohitwaghchaure/report_builder_total_row_issue [Enhancement] Total row added for report builder	2016-12-06 15:42:19 +05:30
Kanchan Chauhan	dc80b35104	[Minor] Apply Salary Slip validation only if it is submitted	2016-12-06 15:37:24 +05:30
Rohit Waghchaure	6f6a533d66	[fix] salary slip working days	2016-12-05 23:33:02 +05:30
Rohit Waghchaure	36a01d3464	[Enhancement] Total row added for report builder	2016-12-05 18:59:59 +05:30
Rushabh Mehta	323c06ebbf	[minor] rename icons as per FontAwesome 4 (#7136 )	2016-12-05 14:17:26 +05:30
Kanchan Chauhan	4a888b4c91	[Fix] lwp issue fixed for salary slip without salary structure	2016-12-04 13:42:30 +05:30
Kanchan Chauhan	faa525e4f1	[Fix] Fixed condition and formula issue in Salary Slip	2016-12-01 15:31:38 +05:30
Rushabh Mehta	4e61564f73	[minor] fixes to daily work summary formatting	2016-11-22 21:59:20 +05:30
Rushabh Mehta	557e7f787b	[minor] UX fixes for Daily Work Summary	2016-11-21 12:10:44 +05:30
Rushabh Mehta	9dd58d42df	[fix] test cases and final wiring for daily work summary	2016-11-18 12:40:18 +05:30
Rushabh Mehta	c10d2a0025	[wip] daily work summary	2016-11-18 12:40:18 +05:30
Rushabh Mehta	fe816c3852	[fix] [wip] daily work summary	2016-11-18 12:40:18 +05:30
Nabin Hait	46753de6d7	fixed merge conflict	2016-11-17 15:55:11 +05:30
Nabin Hait	d4e8b297cd	Merge pull request #6784 from RobertSchouten/calendar_fix [fix] calendar range fixes	2016-11-17 14:45:59 +05:30
Kanchan Chauhan	7652b857c8	[Fix] Filters to get employee in Payroll	2016-11-16 15:29:01 +05:30
Nabin Hait	6d04afc19d	fixed merge conflict	2016-11-16 12:56:31 +05:30
Nabin Hait	00e841d744	update missing salary component abbr	2016-11-16 12:55:17 +05:30
Rushabh Mehta	4bfa0748cd	[merge] master	2016-11-16 11:28:23 +05:30
Rushabh Mehta	8dfbe7c748	[fix] patch missing salary component type based on existing salary slips (#6955 )	2016-11-16 11:18:20 +05:30
Nabin Hait	95e6ccd419	Merge branch 'master' into develop	2016-11-14 12:42:26 +05:30
Nabin Hait	598a0c918d	[fix] fixed student dashboard issue (#6897 )	2016-11-10 17:25:37 +05:30
Nabin Hait	a469e659c5	Fixed merge conflict	2016-11-08 15:26:27 +05:30
Rushabh Mehta	13fc52d713	[minor] added default standard filters (#6854 )	2016-11-07 17:19:19 +05:30
KanchanChauhan	dd01bcc485	Get employee details in Salary Slip (#6837 )	2016-11-07 17:09:07 +05:30
Nabin Hait	f5d8dd3b18	Fixed merge conflict	2016-11-04 16:54:53 +05:30
Nabin Hait	81f7a265bc	Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value Remember last selected value for link field	2016-11-04 16:13:49 +05:30
Kanchan Chauhan	63dda84862	[Fix] Error in pulling in Salary Structure fixed	2016-11-04 12:58:05 +05:30
Rohit Waghchaure	0d2f7e62c0	set remember last selected value as true for company field	2016-11-03 16:19:34 +05:30
Rohit Waghchaure	3844d2cc01	Remember last selected value for link field	2016-11-03 14:49:27 +05:30
Rushabh Mehta	e855f53f08	[minor] fix ellipsis style	2016-11-02 07:34:17 +05:30
robert schouten	bb79fc5b0c	[fix] calendar range fixes	2016-11-01 17:14:51 +08:00
Nabin Hait	df366a6e9c	Merge pull request #6683 from KanchanChauhan/multiple-active-salary-slio Warning if there are mutliple active salary structures	2016-10-24 11:23:57 +05:30
Mainul Islam	a964db7821	Add multiple emoloyee in salary structure (#6621 ) * Add multiple emoloyee in salary structure * Added in Menu * Remove Default Value from Company field * Change Section Label * Added Button in Salary Structure and set route_options * Remove Single Doctype * Add Dialog for Employee Add * View Employee and Check or Uncheck * Complete Multiple Employee Add in Employee Table and Neve Entry in Duplicate in Employees * Employees View Section in Dialog Added Employe Name and set Employee Id as Title * Delete SIngle Doctype * Chagne to * Remove checkbox * Remove add button and set primary button	2016-10-24 11:22:00 +05:30
Nabin Hait	6ef8ede280	Merge pull request #6675 from KanchanChauhan/holiday-in-lwp-salaryslip include_holiday being taken into consideration while calculating lwp	2016-10-24 11:19:43 +05:30
Nabin Hait	5ced4dfe34	Merge pull request #6673 from KanchanChauhan/max-leave-days-in-leave-application-hotfix [Fix] leave application days should be less than max days leave allowed	2016-10-24 11:18:44 +05:30
Nabin Hait	8918dcf54e	Merge pull request #6678 from KanchanChauhan/total-leave-days-updated Total leave days gets updated on date change	2016-10-24 11:13:31 +05:30
Kanchan Chauhan	29ce0aab28	Warning if there are mutliple active salary structures	2016-10-22 20:48:44 +05:30
Kanchan Chauhan	c4c966691f	[Fix] Make Bank Entry button depends_on fixed	2016-10-22 18:04:48 +05:30
Kanchan Chauhan	a084405bca	Total leave days gets updated on date change	2016-10-22 11:55:51 +05:30
Kanchan Chauhan	a1006c0549	include_holiday being taken into consideration while calculating lwp	2016-10-21 17:53:15 +05:30
Kanchan Chauhan	24d580206a	[Fix] leave application days should be less than max days leave allowed	2016-10-21 13:01:33 +05:30
Saurabh	bc0783b527	[fix] duplicate columns in monthly salary report #6623	2016-10-20 12:55:23 +05:30
Nabin Hait	97fa119b37	Set prefered contact email in Employee	2016-10-19 18:26:01 +05:30
Nabin Hait	0702fa2fc6	Fixed version conflict	2016-10-19 16:49:36 +05:30
Nabin Hait	ff183eedb9	Fixes for testcases	2016-10-19 14:23:02 +05:30
Nabin Hait	fa1cdd5bf0	Fixed merge conflict	2016-10-18 15:37:33 +05:30
Rushabh Mehta	17f6874450	[minor] [fix] doctype_dasboard.py files, move data to get_data	2016-10-18 14:54:39 +05:30
Kanchan Chauhan	dc86964e91	Patch fixed for Employee	2016-10-18 11:29:41 +05:30
Nabin Hait	b3b1219109	Fixed merge conflict	2016-10-17 17:42:53 +05:30
Pawan Mehta	1a96cc1e8d	Fixes 6171 (#6417 ) * [fix] #6171 * [fix] #6171 * [fix] #6171 * [fix] #6171 * [fix] #6171 * [fix] #6171 * [fix] #6171 * [fix] #6171	2016-10-17 17:02:12 +05:30
KanchanChauhan	81581c669f	No Leave allocation for Leave Type for which Leave Without Pay is checked (#6626 )	2016-10-17 17:01:29 +05:30
Nabin Hait	395d757c5a	Fixed merge conflict	2016-10-17 16:42:49 +05:30
Nabin Hait	cd9c45f816	Fixed merge conflict	2016-10-07 16:53:07 +05:30
Rohit Waghchaure	370e711f48	[Fix] Expense Claim, sanctioned amount not auto-populated from claim amount	2016-10-06 15:19:53 +05:30
Nabin Hait	80499bb657	Fixed merge conflict	2016-09-29 14:18:53 +05:30
Nabin Hait	2e31d7c7bf	[fix] Validate leave application period with salary slip only if leave type is LWP	2016-09-29 10:59:46 +05:30
Kanchan Chauhan	b40c0a917d	[WIP] Process Payroll Changes	2016-09-28 15:14:41 +05:30
Nabin Hait	1e97fc8687	Merge pull request #6460 from KanchanChauhan/salary-slip-fixes [Fix]Salary Slip can be created without salary structure	2016-09-28 12:55:04 +05:30
Faris Ansari	70b7d3280b	added required fields in doctypes for gantt (#6466 )	2016-09-26 18:20:14 +05:30
Kanchan Chauhan	273c5e71fd	[Fix]Salary Slip can be created without salary structure	2016-09-24 18:56:56 +05:30
robert schouten	147c727743	changed from label based to fieldname based	2016-09-22 08:32:54 +08:00
Nabin Hait	96d38eaac7	Merge pull request #6429 from rohitwaghchaure/minor_fix [Fix] Image is copied when duplicate supplier, employee	2016-09-21 18:40:47 +05:30
Rohit Waghchaure	a7e3d11077	[Fix] Image is copied when duplicate supplier, employee	2016-09-21 18:13:16 +05:30
Kanchan Chauhan	2142a0ab37	[Fix] Indentation fixed	2016-09-21 17:28:42 +05:30
Nabin Hait	521b34c03b	Merge pull request #6413 from KanchanChauhan/salaryslip-docfield-in-condition Salary Slip fields in Condition and Formula	2016-09-21 12:55:27 +05:30
Nabin Hait	081eab147f	Update salary_slip.py	2016-09-21 12:55:16 +05:30
robert schouten	d7721a605d	preferred email for payroll	2016-09-21 11:36:01 +08:00
Nabin Hait	9f4ca1fb9e	set posting date in salalry slip	2016-09-20 18:19:59 +05:30
Nabin Hait	158ac5a844	Merge pull request #6416 from KanchanChauhan/minor-fix [Fix] filters_by_name changed to query_report_filters_by_name	2016-09-20 18:14:00 +05:30
Kanchan Chauhan	77aaa70734	[Fix] filters_by_name changed to query_report_filters_by_name	2016-09-20 17:54:07 +05:30
Kanchan Chauhan	e5057c8c35	Salary Slip fields in Condition and Formula	2016-09-20 14:59:42 +05:30
Nabin Hait	b8eef64e5d	Merge pull request #6325 from RobertSchouten/patch-26 fix allow negatives in leave type check	2016-09-20 11:00:31 +05:30
Nabin Hait	79fe1fad5d	Merge pull request #6374 from RobertSchouten/salary_register print formatting for monthly Salary register	2016-09-20 10:58:53 +05:30

... 16 17 18 19 20 ...

2299 Commits