brotherton-erpnext

Author	SHA1	Message	Date
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
Nabin Hait	33ea19d616	Merge pull request #6395 from RobertSchouten/payroll_date [minor] adding Payroll date field to process payroll and salary slip	2016-09-20 10:57:32 +05:30
robert schouten	5c41c77c7e	added posting date to process payroll and salary slip	2016-09-20 08:19:05 +08:00
Nabin Hait	56700ae148	Merge pull request #6356 from KanchanChauhan/job-application-webform Job Application web form	2016-09-15 17:20:43 +05:30
Neil Trini Lasrado	83d81203b2	Added Student Admissions (#6359 ) * Added Student Admissions * Fixes for Student Application	2016-09-15 14:48:13 +05:30
robert schouten	32c366508a	add print format and id to monthly salary register	2016-09-15 14:21:15 +08:00
Kanchan Chauhan	122d0791a3	Job Application web form	2016-09-13 14:29:02 +05:30
Nabin Hait	fcbb7692fa	Merge pull request #6322 from RobertSchouten/patch-23 leave balance now fy not calendar	2016-09-12 18:53:16 +05:30
Nabin Hait	b7c5b76ed1	Merge pull request #6321 from RobertSchouten/patch-22 allow users without employee with hr permission to view all calendars	2016-09-12 18:52:45 +05:30
RobertSchouten	f4498307c6	fix allow negatives in leave type check	2016-09-09 11:35:51 +08:00
RobertSchouten	2ecddf58d2	leave balance now fy not calendar changed the default from_date and to_date of Leave Balance Report to FY	2016-09-09 10:48:34 +08:00
RobertSchouten	93c095bf16	allow users without employee with hr permission to view all calendars	2016-09-09 10:15:56 +08:00
RobertSchouten	e4d3809c87	allow users without employee with hr permission to view all calendars	2016-09-09 10:14:07 +08:00
pawan	7b2bd20a09	[fix] #6254	2016-09-06 18:28:41 +05:30
pawan	bd9a275d5f	[fix] #6254	2016-09-02 16:51:22 +05:30
Nabin Hait	d260602cae	Merge pull request #6202 from KanchanChauhan/component-type-added 'Type' field added to Salary Component	2016-08-29 16:19:05 +05:30
Kanchan Chauhan	145f87c068	'Type' field added to Salary Component	2016-08-29 15:26:57 +05:30
Nabin Hait	338e63c448	Fixed version conflict	2016-08-29 11:47:50 +05:30
Rushabh Mehta	9d1b56f423	[minor] validate permission in Process Payroll and all products fix for home page	2016-08-29 11:03:10 +05:30
Kanchan Chauhan	22073f3a7f	Layout changes in Salary Structure	2016-08-23 16:14:04 +05:30
Nabin Hait	c95a3180c2	Merge pull request #6127 from KanchanChauhan/demo-fixes-salary Demo updated for new salary structure	2016-08-22 15:22:41 +05:30
Kanchan Chauhan	681a86d70e	[Minor]Fixes	2016-08-22 00:28:20 +05:30
Kanchan Chauhan	db197d593a	Demo updated for new salary structure	2016-08-20 00:30:59 +05:30
Nabin Hait	b5951b72f3	Merge pull request #5924 from KanchanChauhan/salary-structure-changes Formula based Salary Structure	2016-08-18 16:39:58 +05:30
Kanchan Chauhan	bccf0fa041	[WIP] Formula based Salary Structure and multiple employees for same Salary Structure	2016-08-18 13:02:39 +05:30
Abdulla P I	23a6d05622	Update employee_list.js	2016-08-18 12:43:19 +05:30
Rohit Waghchaure	fe913c9969	[Fix] lwp salary structure	2016-08-16 15:43:50 +05:30
Kanchan Chauhan	705384d8fe	Leave Application Validation for processed salary	2016-08-06 13:42:18 +05:30
Neil Trini Lasrado	3e78558357	Moved Intrest to HR module	2016-08-01 15:18:36 +05:30
Nabin Hait	dfcf55d010	Merge pull request #5948 from nabinhait/department_role Assigned permissions for Academic User role in Department	2016-08-01 13:07:02 +05:30
Nabin Hait	86a477d07e	Assigned permissions for Academic User role in Department	2016-08-01 12:51:04 +05:30
Nabin Hait	feed313a66	Delete old salary earning and deduction doctypes	2016-08-01 11:54:19 +05:30
Ben Cornwell-Mott	07e5758a94	Timesheets update on date changes in Salary Slip	2016-07-26 21:00:43 -07:00
Ben Cornwell-Mott	d4d1f1b036	Added date filters for the Timesheet query in Salary Slip	2016-07-26 03:33:38 -07:00
Rushabh Mehta	6c3ac9587e	[fix] quick entry	2016-07-25 15:03:39 +05:30
Rushabh Mehta	e7399dff2d	[fix] homepage patch	2016-07-22 21:01:39 +05:30
Saurabh	9cba6e1f25	[fix] test case fix for expense claim	2016-07-19 11:38:16 +05:30
Saurabh	718d835f45	[enhance] Add Accounts table in to mention expense account based on company #5777	2016-07-19 11:38:16 +05:30
Saurabh	f589c82d68	[enhance] demo for expense claim #5731	2016-07-19 11:38:15 +05:30
Nabin Hait	530b86b9b2	Merge pull request #5752 from KanchanChauhan/employee-holiday-attendance-report-renamed Employee Attendance report renamed to Employees working on a holiday	2016-07-16 10:58:52 +05:30
Rushabh Mehta	55ea7b1f61	[minor] set applicant name automatically	2016-07-15 16:43:25 +05:30
Kanchan Chauhan	9846b945d9	Patch to delete previous report	2016-07-15 14:06:20 +05:30
Kanchan Chauhan	7ff0c4eef4	Employee Attendance report renamed to Employees working on a holiday	2016-07-15 13:42:36 +05:30
Rohit Waghchaure	3bc6a958c7	[Fix] Timesheet overlap issue	2016-07-14 18:27:49 +05:30
Rushabh Mehta	176b63b354	[fix] remove first row on mapping, fixes #5707	2016-07-14 17:43:48 +05:30
Rushabh Mehta	4beba3aff9	Merge pull request #5705 from KanchanChauhan/fixed-employee-holiday-attendance-report Added Holiday List filter	2016-07-12 11:11:43 +05:30
Kanchan Chauhan	54860cd57d	Added Holiday List filter	2016-07-11 15:16:47 +05:30
Rushabh Mehta	391c0efcee	[fix] make grids editable	2016-07-11 13:01:58 +05:30
Nabin Hait	12e8277b6b	Merge pull request #5681 from nabinhait/sal_slip_print Print formats for salary slip	2016-07-08 08:35:31 +05:30
Rohit Waghchaure	0d4a9c225f	[Salary Structure] Make salary_component field mandatory if salary_slip_based_on_timesheet is true	2016-07-07 17:04:54 +05:30
Rushabh Mehta	964ad0fcae	[cleanup] rename "links" to "dashboard"	2016-07-07 14:28:05 +05:30
Nabin Hait	027acde4f4	Print formats for salary slip	2016-07-07 13:17:21 +05:30
Rohit Waghchaure	e94d18b4cd	Rename Time Sheet doctype	2016-07-06 20:38:50 +05:30
Rohit Waghchaure	3188b56694	[Fixes] Time sheet fixes	2016-07-06 14:31:14 +05:30
Kanchan Chauhan	d963b76a4b	Salary component cleanup	2016-07-06 12:04:38 +05:30
Saurabh	c2934ba9da	[minor][fix] holiday list exception message fix	2016-07-04 13:06:29 +05:30
Nabin Hait	13093b4b68	Make payment entry aginst order, payment request and patch to rename advance table fields	2016-07-04 11:42:24 +05:30
Rushabh Mehta	b33df4afe8	[cleanup] link methods made common	2016-07-04 11:39:25 +05:30
Rushabh Mehta	8c2e79cf0d	[minor] fixes	2016-07-04 11:39:25 +05:30
Rohit Waghchaure	3fa0b51e5e	[Fixes] Time sheet fixes and changed timesheets to time_logs	2016-06-29 19:04:16 +05:30
Rohit Waghchaure	a62dcce46a	[Fix] make_for field removed	2016-06-29 01:42:52 +05:30
Rushabh Mehta	822209cb03	Merge pull request #5538 from rohitwaghchaure/time_sheet_wages [Enhancement] Time log wages and multiple active salary structure	2016-06-27 17:13:48 +05:30
Rushabh Mehta	689130cf9b	[minor] fix holiday_list validation	2016-06-27 17:16:00 +05:30
Rohit Waghchaure	d6c986da8f	[Enhancement] Time log wages and multiple active salary structure	2016-06-27 16:46:39 +05:30
Kanchan Chauhan	68f5ae5cbf	Changes done	2016-06-26 14:10:24 +05:30
Kanchan Chauhan	4c0df04db0	Retirement Age option in HR Settings	2016-06-25 17:45:16 +05:30
Rushabh Mehta	a334062b03	[redesign] website routing system	2016-06-24 16:18:07 +05:30
Rushabh Mehta	8a065e0028	[rename] Bulk Email to Email Queue	2016-06-22 12:58:39 +05:30
Nabin Hait	2460ee897a	Merge pull request #5367 from KanchanChauhan/job_openings_public [Minor Fix] Job Opening should not require login	2016-06-01 13:18:26 +05:30
Rushabh Mehta	535f3b0975	[minor] make task editable in project and add description to designation fixing #5361	2016-06-01 12:52:50 +05:30
Rushabh Mehta	aa60fd9037	[fix] new_doc to frappe.new_doc	2016-06-01 11:46:33 +05:30
Kanchan Chauhan	adad5fb11e	[Minor Fix] Job Opening should not require login	2016-05-18 16:33:29 +05:30
Anand Doshi	c2ade3d34f	Merge pull request #5298 from neilLasrado/sal-slip Moved email salary slip to employee under HR Settings	2016-05-09 16:56:51 +05:30
Neil Trini Lasrado	b2b0b37cc1	Added reference_doctype and reference_name to link Bulk Email to Salary Slip	2016-05-09 13:24:31 +05:30
Nabin Hait	332d29f166	Merge branch 'master' into develop	2016-05-06 16:13:35 +05:30
Nabin Hait	09fec7a15e	Merge pull request #5313 from shreyasp/support-week-hotfix [Hotfixes] Payment tool and Leave Allocation Tool	2016-05-05 16:44:40 +05:30
shreyas	55cbd52200	[Fix] Allocate leaves only to active employees	2016-05-05 15:16:39 +05:30
Valmik Jangla	a0b9c4cdeb	Fixed Leave Application issue	2016-05-05 01:20:47 -07:00
Neil Trini Lasrado	71e93d6691	Added test cased	2016-05-02 12:04:20 +05:30
Neil Trini Lasrado	b14af59d39	Moved send email checkbox from salary slip to a global setting under hr settings	2016-05-02 12:04:19 +05:30
Rushabh Mehta	be2ee18de4	[fixed] frappe.require is now async 💥	2016-04-29 17:22:42 +05:30
Rushabh Mehta	1aa1c8a9ef	[minor] remove hide_first in forms	2016-04-29 12:20:23 +05:30
Anand Doshi	79c536acb5	Merge branch 'master' into develop	2016-04-27 15:44:11 +05:30
Saurabh	9be40ee7c3	[fixes] raise exception while deleting fiscal year if fiscal year is set as default in Global Settings and while calculating get_month_details if year_start_date not found	2016-04-27 12:58:40 +05:30
Rushabh Mehta	c291ab64a6	Merge pull request #5197 from KanchanChauhan/UXChanges_ERPNext [WIP] No not merge	2016-04-21 11:39:45 +05:30
Rushabh Mehta	02772442b6	[cleanup] added dashboard in project	2016-04-20 18:45:56 +05:30
Kanchan Chauhan	11638ba358	Changes 3	2016-04-20 16:24:25 +05:30
Kanchan Chauhan	704f248952	Changes 2	2016-04-20 16:24:24 +05:30
Rushabh Mehta	0525387328	[enhancement] added reserved_qty_for_production in bin and updated item dashboard	2016-04-18 19:27:46 +05:30
Nabin Hait	972c25f78d	Fixed conflict	2016-04-14 18:25:53 +05:30
Rushabh Mehta	15a7f215b9	[enhancement] heatmaps on item and notifications for item	2016-04-14 17:30:53 +05:30
Rushabh Mehta	0e2dd859b0	[cleanup] link dashboard for customer, supplier, item, employee and hide form by default	2016-04-13 17:22:09 +05:30
Neil Trini Lasrado	cb6430575b	Fixed validation message for disabled employee	2016-04-08 16:36:26 +05:30
Valmik Jangla	c33e96f860	Leave Allocation Fix	2016-04-07 12:02:31 +05:30
Rushabh Mehta	78b7a53635	[cleanup] set default bold, print_hide for prints	2016-04-06 15:29:45 +05:30
Anand Doshi	ca95384f05	[fix] Salary Slip: use accounts.utils.get_fiscal_year	2016-04-06 12:31:01 +05:30
Rushabh Mehta	d690094b12	[image] added default image field for employee, customer, item, contact, lead, supplier and using - instead of / as separator in BOM	2016-04-04 16:57:56 +05:30
Rushabh Mehta	cb144bfcd4	[cleanup] projects	2016-03-31 14:27:35 +05:30
Rushabh Mehta	c9850f9e04	Merge pull request #5077 from frappe/master Master	2016-03-29 11:59:32 +05:30
Rushabh Mehta	3117b4b8d6	[fix] minor for quick-entry	2016-03-29 11:53:17 +05:30
Rushabh Mehta	1b5edcbbd8	[fix] holiday_list issues in maintenance schedule too	2016-03-25 11:22:15 +05:30
Rushabh Mehta	51135a1522	[fix] fix get holidays in leave application	2016-03-25 11:13:11 +05:30
Rushabh Mehta	e29192c197	[fix] default letter in salary slip comes from customized default or company and optimized boot for curreny	2016-03-22 14:52:25 +05:30
Saurabh	6a277e244c	[fixes] set todays date on employee attendance tool	2016-03-20 19:00:26 +05:30
rohitwaghchaure	277b7fa641	[Enhancement]Fetch default letter head of company on salary structure and salary slip	2016-03-18 16:33:18 +05:30
Valmik Jangla	15343be386	Commonified functions for retrieving Leave Approvers	2016-03-17 11:47:30 +05:30
Valmik Jangla	33cc081c3b	Improved Leave Application / Approver feature	2016-03-17 11:47:30 +05:30
Nabin Hait	89301863e5	minot fixes	2016-03-15 15:20:49 +05:30
Anand Doshi	4284fcf2a6	[fix] additional fixes for removal of Fiscal Year form Holiday List	2016-03-11 17:16:30 +05:30
Valmik Jangla	e2b8af16ed	Fixed Salary Slip to work with new Holiday List	2016-03-11 14:58:55 +05:30
Valmik Jangla	ba54a43e32	Fixed Maintenance Schedule to work wit new Holiday List Improved code in Holiday List for speed	2016-03-11 14:58:55 +05:30
Valmik Jangla	3427c939bd	Removed unused code	2016-03-11 14:58:55 +05:30
Valmik Jangla	c666030f34	Get Weekly Off dates now gets dates dynamically Fixed Holiday List test records	2016-03-11 14:58:55 +05:30
Valmik Jangla	3085186182	Removed Fiscal Year from Holiday List and Calendar	2016-03-11 14:58:55 +05:30
Anand Doshi	c75c1d7e3e	[fix] additional fixes after deprecating Fiscal Year	2016-03-11 14:56:19 +05:30
Valmik Jangla	d9cc14ddd5	Removed from Leave Block List and Monthly Attendance List	2016-03-11 13:07:49 +05:30
Valmik Jangla	13bb2ba779	Removed fiscal year related things from, Recurrent Document, Leave Application, Upload attendance, Stock Reconciliation and Stock Balance	2016-03-11 13:07:49 +05:30
Valmik Jangla	d89dcf60e6	Removed from Delivery Note and Appraisal Added back in Stock Ledger Entry Added validation in GL Entry and SL Entry Stock Controller sets Fiscal Year using Posting Date	2016-03-11 13:07:48 +05:30
Valmik Jangla	98ec1164fc	Removed from Attendance, Upload Attendance, and Sales Order	2016-03-11 13:07:16 +05:30
Valmik Jangla	c4c603dcd2	Removed from Expense Claim	2016-03-11 13:05:19 +05:30
Anand Doshi	22ef68945d	[minor] comment about hack	2016-03-11 12:47:14 +05:30
Javier Wong	102f9062e8	Whitelist get_month_details This is useful when manually pulling the salary structure in custom scripts for processing of other customized deductables or perhaps contributions.	2016-03-08 17:39:58 +05:30
Rushabh Mehta	fe6eadfe22	[cleanup] job opening and job applicant	2016-03-02 12:53:19 +05:30
Rushabh Mehta	ae7dc31d14	Merge pull request #4846 from KanchanChauhan/job-applicant Added feature to allow people to apply for job from website	2016-02-29 17:22:01 +05:30
Rushabh Mehta	a4decc2c59	[minor] [test] fix for leap year	2016-02-29 14:44:20 +05:30
Kanchan Chauhan	2e8cc89e34	Added webform for Job Opening	2016-02-19 17:31:13 +05:30
Anand Doshi	6e8eaf097a	[fix] test case of Leave Application	2016-02-19 00:27:02 +05:30
Valmik Jangla	7ae844f0a0	Minor fix	2016-02-17 15:06:30 +05:30
Valmik Jangla	b7ae1c1076	Inactive employees show up in report	2016-02-17 15:05:35 +05:30
Neil Trini Lasrado	25ab93a881	Changed image in employee from Attach to Attach Image, removed image view	2016-02-17 13:00:37 +05:30
Anand Doshi	870d0441a8	[minor] moved make_employee from Employee to Offer Letter	2016-02-16 15:53:09 +05:30
Valmik Jangla	5e771c5678	Changed doclist to doc	2016-02-16 15:33:35 +05:30
Valmik Jangla	93b1072cba	Improved code	2016-02-16 15:33:35 +05:30
Valmik Jangla	bddc80bc66	Make Employee from Offer Letter	2016-02-16 15:33:35 +05:30
Anand Doshi	5f72504de1	[enhancement] Expense Claim - View Bank Entries	2016-02-15 18:02:38 +05:30
Rushabh Mehta	c403ce3b4f	Merge pull request #4763 from rmehta/leave-app-cleanup [cleanup] leave application	2016-02-08 18:51:29 +05:30
Anand Doshi	17d4fc4fa7	[enhancement] Merge Comment and Feed into Communication 💥 Depends on frappe/frappe#1532	2016-02-08 13:06:56 +05:30
Rushabh Mehta	ca2ce13817	Merge pull request #4748 from vjFaLk/Monthly-attendance-fix Employees with no attendance show up as blank now	2016-02-08 10:58:45 +05:30
Rushabh Mehta	57fb74f262	Merge pull request #4742 from nabinhait/multifixes1 Multi fixes	2016-02-08 10:55:48 +05:30
Rushabh Mehta	cde997edfa	[cleanup] leave application	2016-02-08 10:53:22 +05:30
Rushabh Mehta	65ade073a9	Merge pull request #4733 from ShashaQin/patch-15 Update leave_application.py	2016-02-08 10:22:09 +05:30
Valmik Jangla	de7e760788	Employees with no attendance show up as blank	2016-02-05 17:46:14 +05:30
Valmik Jangla	235de6566e	Minor fix	2016-02-05 15:07:16 +05:30
Nabin Hait	3110c4a772	[fix] Make bank entry from expense claim	2016-02-04 17:22:57 +05:30
Valmik Jangla	8d0ed21c04	Added From and To date to Holiday Report Changed HD to H in Monthly Attendance Report	2016-02-04 12:18:55 +05:30
ShashaQin	995a71c854	Update leave_application.py fix half day leave issue	2016-02-03 13:10:15 +08:00
Valmik Jangla	0a76b8b29a	Fixed issue where no Holidays would cause the report to break	2016-01-30 10:59:40 +05:30
Anand Doshi	6e33d91443	[minor] fixes to attendance tool and employee holiday attendance	2016-01-29 16:57:54 +05:30
Valmik Jangla	07364f5ece	Feature - Employee Attendance Tool	2016-01-29 16:57:54 +05:30
Valmik Jangla	1890c794d7	Added Employee Report Attendance Report Made Holiday details mandatory	2016-01-29 16:57:54 +05:30
Saurabh	e23e99f4bd	[enhance] merge customize buttons under groups	2016-01-13 09:18:31 +05:30
Anand Doshi	03e7e581d8	[minor] removed Communication table	2016-01-06 13:23:45 +05:30
Rushabh Mehta	969d48a554	[translations] fixes #4534-38	2016-01-04 16:09:40 +05:30
Nabin Hait	b6b56453e1	[fix] Get defaults based on doctype or fieldname	2015-12-23 16:37:06 +05:30
Nabin Hait	533aba02c5	[fix] Payment days calculation in salary slip	2015-12-10 10:50:42 +05:30
Nabin Hait	9421e9873a	[fix] Allowed import for Expense Claim	2015-12-07 10:40:13 +05:30
Nabin Hait	c43a11a313	Merge pull request #4431 from nabinhait/leave_fix [fix] Don't validate balance for lwp and in balance consider all leaves in the allocation period	2015-12-05 12:43:38 +05:30
Nabin Hait	d53e780fb8	[fix] Don't validate balance for lwp and in balance consider all leaves in the allocation period	2015-12-05 12:15:49 +05:30
Nabin Hait	734a40ad62	[fix] Offer letter print format fixed	2015-12-04 12:19:21 +05:30
Nabin Hait	a4eeb919e6	[fix] Set payment days considering joinging date, reliving date and applicable holidays	2015-12-03 15:10:30 +05:30
Nabin Hait	c4d9554a05	[fix] Payment Days and holidays considering joining and relieving dates	2015-12-03 15:10:30 +05:30
Nabin Hait	8df5900f98	[fix] Inactive salary structure validation	2015-12-02 14:50:08 +05:30
Anand Doshi	602e8253be	[enhancement] Int, Currency, Float, Percent as not null and default to 0	2015-11-19 13:23:36 +05:30
Nabin Hait	0f72750fc8	Merge pull request #4338 from anandpdoshi/fix/salary-slip-earning-deduction [fix] pull earning and deduction on change of employee	2015-11-19 12:06:37 +05:30
Anand Doshi	7763bb5c15	[fix] pull earning and deduction on change of employee	2015-11-18 19:04:03 +05:30
Saurabh	a4bf02de6c	[fixes] overlapping allocation	2015-11-18 17:39:26 +05:30
Saurabh	3bcf82c7a6	[fixes] test leave allocation record creation	2015-11-18 17:39:26 +05:30
Nabin Hait	c7fc11a812	[fix] Don't add pagebreak in print format if terms contains only spaces and newlines	2015-11-18 12:59:00 +05:30
Anand Doshi	3667da1053	[fix] Set user_id as Reply-To in birthday reminder emails	2015-11-16 19:31:20 +05:30
Nabin Hait	b3a68c3f40	Merge pull request #4323 from nabinhait/leaves [fix][cleanup] Leave allocation, application and balance report cleanup and fixes	2015-11-16 15:57:04 +05:30
Nabin Hait	b6de519571	[fix] Test case fixed	2015-11-16 15:50:10 +05:30
Nabin Hait	58c4646199	[fix][cleanup] Leave allocation, application and balance report cleanup and fixes	2015-11-16 15:35:14 +05:30
Nabin Hait	cd87e76d88	[fix] Check Salary Structure validity	2015-11-15 11:06:55 +05:30
Rushabh Mehta	64e31e9a4e	[fix] process payroll	2015-11-06 14:47:12 +05:30
Rushabh Mehta	b9e7cb02f4	[change-log]	2015-11-04 17:02:13 +05:30
Rushabh Mehta	d48c2394e8	[cleanup] drop ship testing & cleanup	2015-11-04 15:24:04 +05:30
Rushabh Mehta	5951692db0	[fix] cleanup stop-resume code	2015-11-03 18:20:39 +05:30
Saurabh	20a653e829	[fixes] Test case fixes for leave application	2015-10-29 14:27:57 +05:30
Saurabh	a2c668cb77	[fixes] patch, test cases and validations	2015-10-29 14:27:57 +05:30
Saurabh	d0b0a80be3	[enhacement] remove fiscal year from leave allocation	2015-10-29 14:27:57 +05:30
Nabin Hait	7a9f46d9d1	[fix] Value mapping while making bank entry from Expense Claim	2015-10-23 13:19:01 +05:30
Anand Doshi	683f756d0f	[fix] Fetch company of employee in leave application	2015-10-22 18:52:15 +05:30
Anand Doshi	c346484ca4	[minor] leave application cleanup	2015-10-21 19:56:14 +05:30
Saurabh	ba2133cba2	[minor][fix] set default fiscal year for holiday list calendar view	2015-10-19 19:20:11 +05:30
Anand Doshi	1d093a4039	[fix] change attach fields to small text	2015-10-19 12:56:29 +05:30
Rushabh Mehta	ee6862b277	[fix] VARCHAR lengths as 140	2015-10-14 17:28:35 +05:30
Anand Doshi	71ebad5668	Limit varchar length to 140 instead of 255 to mitigate Row Size Too Large error	2015-10-14 16:13:49 +05:30
Rushabh Mehta	174299124f	[cleanup] [wip] email digest	2015-10-14 15:53:37 +05:30
Rushabh Mehta	626ba1bb81	[translations] added bn, da-DK, es-PE, si	2015-10-14 15:24:42 +05:30
Saurabh	b0dbdc1439	minor fixes	2015-10-07 11:27:25 +05:30
Saurabh	74eb8e34da	[Fixes] minor fix for fiscal year in holiday list	2015-10-07 11:17:14 +05:30
Saurabh	1d753c92b1	Calendar view for holiday listing	2015-10-06 15:21:23 +05:30
Nabin Hait	712b02593a	[fix] Month issue fixed in Monthly Attendance Sheet	2015-10-01 12:35:54 +05:30
Anand Doshi	0a1d037f01	Merge pull request #3974 from rmehta/dms [enhancement] document management system	2015-09-22 14:51:01 +05:30
Anand Doshi	0fd3347148	[fix] handle invalid date in get_retirement_date	2015-09-15 11:29:51 +05:30
Anand Doshi	dbe623b167	[fix] Use User Permission value as default only if the document type is Setup	2015-09-14 13:08:53 +05:30
Anand Doshi	840cad0ff7	Don't copy title field in Duplicate	2015-09-11 12:26:57 +05:30
Anand Doshi	bc1e8b4408	[minor] Unset Apply User Permissions in default permissions	2015-09-08 19:23:23 +05:30
Rushabh Mehta	be9edae961	[fixes] to task test case and fix tree ui for mobile	2015-09-04 16:18:17 +05:30
Rushabh Mehta	4223d7c044	[minor] task not mandatory for Time Log and Expense Claim #3904	2015-09-04 16:18:17 +05:30
Rushabh Mehta	deb38f7a68	[enhancement] document management system	2015-09-02 18:34:24 +05:30
Anand Doshi	8b66f2a691	Exported all doctypes	2015-08-27 16:45:52 +05:30
Rushabh Mehta	81e9d4e8f5	[fix] changed text > text editor for description fields in tables	2015-08-19 13:00:03 +05:30
Rushabh Mehta	cdbb448f6c	[fix] salary slip to consider disable rounded total, #3792	2015-08-13 12:48:04 +05:30
Rushabh Mehta	1828c12481	[refactor] added dynamic link in journal entry, #3847	2015-08-12 12:28:33 +05:30
Nabin Hait	d8546c4316	Fixed include holiday logic in leave calculation	2015-07-30 14:53:27 +05:30
Neil Trini Lasrado	e73941b9cc	Fixes in leave application	2015-07-29 18:39:27 +05:30
Nabin Hait	d1dc622914	[fix][patch] Reload Leave Type	2015-07-29 16:37:02 +05:30
Nabin Hait	b24d2efc4b	[fix] Updated 'Include Holiday' in existing and default leave type records	2015-07-29 16:15:08 +05:30
Nabin Hait	a184fbfa66	Merge branch 'develop' of https://github.com/meatechsupport/erpnext into meatechsupport-develop	2015-07-29 16:05:47 +05:30
Anand Doshi	0e6f2474e8	[minor] removed trailing space in offer letter status	2015-07-29 11:27:02 +05:30
Meatechsupport	e102332f08	removed testcase	2015-07-28 19:03:30 +04:00
Meatechsupport	145227e4ec	Edited the Test case	2015-07-28 18:39:04 +04:00
Meatechsupport	8b96fdac12	Indentation Error realligned	2015-07-27 16:55:54 +04:00
Meatechsupport	e319598c51	IndentationError alligned code	2015-07-27 16:42:22 +04:00
Meatechsupport	5c73bafeaa	Modifying the number of leave days calculation part. we don't need to exclude the Holiday list (that comes in between) from the total number of leaves applied. Add option in the leave type added a field in the leave type to include and exclude the holidays from the tolal leave applied days Added the field Added a field Include Holiday to leave Type doctype changed the lable changed the lable from "Include Holiday" to "Include holidays within leaves as leaves" Rearranged the function moved holidays = leave_app.get_holidays() under if Corrected 'total_leave_days' : flt(tot_days)-flt(holidays) Adding test case added the test case Added test case Added test case to test_leave_application.py adding default value added default value and corrected the syntax. IndentationError removed extra tabs after	2015-07-27 13:46:00 +04:00
Anand Doshi	d0d1af2072	Merge pull request #3696 from nabinhait/fix1 [fix][report] Show only active employee in Employee leave balance report	2015-07-20 13:27:47 +05:30
Nabin Hait	c9e4fbeda0	[fix][report] Show only active employee in Employee leave balance report	2015-07-20 12:57:48 +05:30
Neil Trini Lasrado	feda4f9bc9	Default Expense Account added to Expense Claim Type. Fetch account while making Bank Entry	2015-07-16 15:44:56 +05:30
Rushabh Mehta	94157334a7	[rename] Material User > Stock User	2015-07-13 15:06:12 +05:30
Neil Trini Lasrado	4089b3d376	Salary Slip renamed to Process Payroll	2015-07-13 12:41:28 +05:30
Neil Trini Lasrado	6cfab43d5f	Renamed Depends on LWP field in the Earning and Deduction table of Salary Slip.	2015-07-13 12:41:27 +05:30
Rushabh Mehta	ccb9117ba5	[minor] Added employees in Newsletter List	2015-07-09 13:56:02 +05:30
Nabin Hait	4017bfcd2e	Merge pull request #3591 from rmehta/salary-manager-fix [fixes] salary manager #3554	2015-07-08 15:39:33 +05:30
Rushabh Mehta	f9b356992a	[fixes] salary manager #3554	2015-07-07 16:30:29 +05:30
Nabin Hait	526957505f	Merge pull request #3569 from rmehta/employee-unset-user-id [fix] remove user permission if user id is unset #3447	2015-07-06 14:27:22 +05:30
Tsutomu Mimori	5a0fbff1a3	#3402	2015-07-03 16:08:02 +09:00
Rushabh Mehta	5688a6c31a	[fix] remove user permission if user id is unset #3447	2015-07-03 11:34:53 +05:30
Neil Trini Lasrado	086f8942eb	Fixed bugs in Calender View for Leave Application	2015-06-22 13:51:56 +05:30
Nabin Hait	5d0ce7939f	Show only users with Expense Approver role in Expense Claim Approver field	2015-06-15 17:59:37 +05:30
Neil Trini Lasrado	82cc2921d1	Validation added to prevent user from creating salary structure with 'From Date' before employee 'Date of joining'	2015-06-12 18:34:08 +05:30
Nabin Hait	0b18a2d347	Reset values in tools like Payment Tool	2015-06-05 12:01:29 +05:30
Nabin Hait	3ebfad7115	minor fixes	2015-06-01 14:01:56 +05:30
Nabin Hait	e2c200a91e	Make gl entry for rounded-off amount	2015-05-29 10:39:09 +05:30
Nabin Hait	2eba53f763	test case fixes	2015-05-22 16:55:55 +05:30
Rushabh Mehta	9dd8aab211	[fix] status updater	2015-05-18 11:19:10 +05:30
Neil Trini Lasrado	2edc91bc52	Leave Type - LWP changed to Leave Without Pay	2015-05-11 14:38:21 +05:30
Neil Trini Lasrado	ec2f3d6e63	leave_allocation layout changed	2015-05-11 14:38:20 +05:30
Rushabh Mehta	82ee5fdba6	[email] changes in email_account api	2015-05-04 18:17:22 +05:30
Nabin Hait	fb1f4a5c58	User permissions for Expense Claim	2015-05-02 18:46:29 +05:30
Rushabh Mehta	5e13799704	[fixes] leave approver selection and cleaned up layout	2015-04-30 12:55:10 +05:30
Nabin Hait	4669fe3e85	minor fix	2015-04-22 15:34:44 +05:30
Neil Trini Lasrado	ecb5d11e2d	Today added as default date for posting date in expense claim	2015-04-22 11:26:00 +05:30
Neil Trini Lasrado	5e317d2b72	fixes in Expense Claim and get_avtivity_cost function	2015-04-22 11:26:00 +05:30
Neil Trini Lasrado	d4b33d3c14	Costing added in Time log Batch, Sales Order added to Project + more fixes	2015-04-22 11:25:59 +05:30
Neil Trini Lasrado	4e6e4726a4	filters added, ui change, update project moved to project.py	2015-04-22 11:25:59 +05:30
Neil Trini Lasrado	ec5c66f8f0	Title Feild added to Expense Claim	2015-04-22 11:25:59 +05:30
Neil Trini Lasrado	05f15bbb88	fixes in Test Cases	2015-04-22 11:25:59 +05:30
Neil Trini Lasrado	2679b247b3	fixes in Expense Claim	2015-04-22 11:25:58 +05:30
Neil Trini Lasrado	7f9ea3bf6a	expense claim test records	2015-04-22 11:25:58 +05:30
Neil Trini Lasrado	a11770f06f	in Time Log - Server side validations added to recalculate cost on save	2015-04-22 11:25:58 +05:30
Neil Trini Lasrado	50234cb0fe	Task added to expense claim all cost (expense claim and time log) against Task; task updates project cost.	2015-04-22 11:25:58 +05:30
Neil Trini Lasrado	458b8885f0	New Document Activity Cost created. In TL - billing rate and internal rate added In Project - total expense claim and total activity cost. Buttons addded - show time logs and show expense claims. In Expense Claim - Employee and project link added. update cost in project on submit and on trash. Validation added to check sanctioned amount is not greater than claim amount.	2015-04-22 11:25:57 +05:30
Rushabh Mehta	80f8b7be2f	[minor] [perms] Expense Claim Type	2015-04-19 16:18:15 +05:30
Rushabh Mehta	2dea40f7be	[leave-allocation] can cancel and re-submit or make a new one, fixes frappe/erpnext#3042	2015-04-15 15:08:48 +05:30
Anand Doshi	00a07de426	fixed test earning type	2015-04-08 21:49:11 +05:30
Anand Doshi	2f87fb41fa	Merge pull request #3069 from neilLasrado/dob validation added - dob cannot accept a future date	2015-04-08 13:25:01 +05:30
Anand Doshi	a1a3468704	Merge pull request #3068 from neilLasrado/leaves Bug Fixes	2015-04-08 13:20:18 +05:30
Neil Trini Lasrado	4b29ccc2b0	Salary Structure - Earnings made mandatory	2015-04-08 12:29:40 +05:30
Neil Trini Lasrado	4ba4d9dbef	fix - update button didnt work in leave allocation after submit	2015-04-08 12:29:40 +05:30
Neil Trini Lasrado	20f0ef2515	validation added - dob cannot accept a future date	2015-04-08 12:29:01 +05:30
Neil Trini Lasrado	28b0cc4d0b	fixes in offer letter	2015-04-08 12:28:21 +05:30
Neil Trini Lasrado	496e277d8a	print format added	2015-04-08 12:28:21 +05:30
Rushabh Mehta	aca5cb6513	[fixes] offer letter	2015-04-08 12:28:21 +05:30
Neil Trini Lasrado	8ca547b7f2	terms view added	2015-04-08 12:28:21 +05:30
Neil Trini Lasrado	e1d620b168	Offer Letter - New Doctype added and job_applicant naming changed	2015-04-08 12:28:20 +05:30
Rushabh Mehta	ffc190d34d	Merge pull request #3013 from neilLasrado/expense Expense Claim - 'Total Amount Reimbursed' feild added	2015-04-02 14:29:29 +05:30
Anand Doshi	7b6daafbb9	[minor] left aligned email footer, raise duplicate entry error for common email id in Employee and Sales Person	2015-04-01 16:26:59 +05:30
Anand Doshi	ee57a8d2a4	[hotfix] unique job applicant	2015-04-01 12:29:30 +05:30
Anand Doshi	d6a360b51b	[fix] check job application unique email id	2015-03-30 21:11:34 +05:30
Neil Trini Lasrado	a6b3415cdd	Expense Claim - 'Total Amount Reimbursed' feild added	2015-03-26 14:13:44 +05:30
Rushabh Mehta	04f907efcf	[fix] job applicant (test via import)	2015-03-23 15:44:54 +05:30
Rushabh Mehta	c2eae25d0e	[cleanup] validate_email_add	2015-03-23 14:10:51 +05:30
Anand Doshi	9d8154dd40	fixed test cases	2015-03-18 16:22:13 +05:30
Anand Doshi	ec5ec60764	Fixed Test Cases	2015-03-05 19:31:40 +05:30
Rushabh Mehta	2cc585f180	[git fixes] salary manager, time log title, notificaitons	2015-03-03 16:06:54 +05:30
Nabin Hait	56c6a65a22	argument name fix in sendmail	2015-03-03 15:48:33 +05:30
Anand Doshi	885e074697	Changed company name from Web Notes to Frappe Technologies	2015-03-03 14:56:43 +05:30
Nabin Hait	786472279a	salary slip calculation: trigger on	2015-03-03 14:07:21 +05:30
Rushabh Mehta	c37281e59c	Merge pull request #2897 from neilLasrado/job-application job application fixed	2015-03-02 19:01:16 +05:30
Neil Trini Lasrado	96bc31db27	job application fixed	2015-03-02 18:54:45 +05:30
Rushabh Mehta	910ba02f49	Merge pull request #2896 from neilLasrado/employee-report employee information report fix	2015-03-02 18:31:47 +05:30
Neil Trini Lasrado	71a651ec21	employee information report fix	2015-03-02 18:13:25 +05:30
Neil Trini Lasrado	fd0920fe83	Fixes in Appraisal doc	2015-03-02 17:33:48 +05:30
Anand Doshi	d35354cc06	Merge remote-tracking branch 'frappe/develop' into v5.0 Conflicts: erpnext/__version__.py erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py erpnext/hooks.py erpnext/patches.txt erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py erpnext/stock/get_item_details.py erpnext/translations/ar.csv erpnext/translations/bs.csv erpnext/translations/ca.csv erpnext/translations/el.csv erpnext/translations/es.csv erpnext/translations/fr.csv erpnext/translations/hr.csv erpnext/translations/id.csv erpnext/translations/is.csv erpnext/translations/ja.csv erpnext/translations/nl.csv erpnext/translations/pl.csv erpnext/translations/pt-BR.csv erpnext/translations/ru.csv erpnext/translations/tr.csv erpnext/translations/zh-cn.csv erpnext/translations/zh-tw.csv setup.py	2015-02-24 18:12:17 +05:30
Anand Doshi	d57e793bf3	[fix] Added unicode_literals if missing in py files	2015-02-24 12:24:53 +05:30
Rushabh Mehta	d54031f3b5	[tests] [projects] merged tasks and projects and added quick edit of tasks from projects	2015-02-22 22:32:39 +05:30
Rushabh Mehta	813f0eda05	[form] section labels	2015-02-20 16:02:48 +05:30
Rushabh Mehta	50dc4e90e3	[cleanup] item grid views, removed desc etc	2015-02-19 20:05:45 +05:30
Rushabh Mehta	d60acb9f26	[fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation	2015-02-19 14:53:31 +05:30
Nabin Hait	8fa503e177	Fixed conflict while merging v4 into v5	2015-02-10 16:44:00 +05:30
Nabin Hait	15cd12214e	Fixed conflict while merging v4 into v5	2015-02-10 16:37:18 +05:30
Anand Doshi	6dfd430a2f	Moved flags like ignore_mandatory, ignore_validate etc to doc.flags	2015-02-10 14:41:27 +05:30
Rushabh Mehta	a232c80d77	[share] add share permission	2015-02-05 15:52:58 +05:30
Do Le Bao Nguyen	f9b63dd36a	Look like a minor bug - There is no frappe.get_default but only frappe.db.get_default ? - Error return if selecting Employee in Salary Slip without specifying the Fiscal Year first	2015-02-03 11:10:09 +08:00
Rushabh Mehta	06fa46fafe	[fix] onshow > on_page_show	2015-01-29 18:09:11 +05:30
Rushabh Mehta	5bceebc6a1	[fix] fixes birthday reminders #2021	2015-01-23 15:22:30 +05:30
Rushabh Mehta	0335005eea	[minor] added allow rename	2015-01-15 15:29:22 +05:30
Nabin Hait	fff3ab752c	Fixed conflict	2015-01-14 16:27:13 +05:30
Nabin Hait	024b537b7f	Merge pull request #2557 from neilLasrado/spelling-of-approver Spelling Correction - Leave application #2552	2015-01-12 17:02:10 +05:30
Rushabh Mehta	d49a123fd0	[ui] listviews	2015-01-07 16:43:47 +05:30
Neil Trini Lasrado	1b7d66fab6	Update leave_application.js	2015-01-07 11:16:41 +05:30
Nabin Hait	56ac3fb29d	some fixes for renaming patch	2015-01-01 13:40:54 +05:30
Rushabh Mehta	419ae33c3e	[merge] v5-design	2014-12-31 15:03:14 +05:30
Nabin Hait	54361e8651	fixed conflict while merging develop into v5	2014-12-31 13:24:36 +05:30
Rushabh Mehta	f870527e7c	[design] wip	2014-12-26 12:52:11 +05:30
Nabin Hait	79f091e2fe	field renaming	2014-12-26 11:41:15 +05:30
Nabin Hait	4b8185db19	renaming: entries	2014-12-25 18:19:39 +05:30
Nabin Hait	23d2a53017	Code replacement for journal voucher renaming	2014-12-25 17:14:18 +05:30
Nabin Hait	e7d153624f	Table Field Renaming: code replace, JV and budget distribution renamed	2014-12-25 16:01:55 +05:30
Nabin Hait	d8f4984d71	Table fieldnames renaming: updated json and patch	2014-12-24 17:04:48 +05:30
Nabin Hait	0741ed3a82	Merge pull request #2472 from neilLasrado/expense-claim New feature for issue #2419	2014-12-23 18:07:38 +05:30
Neil Trini Lasrado	41781ce686	test case fix - holiday list	2014-12-23 17:38:59 +05:30
Neil Trini Lasrado	e84fa67f30	Actual operating cost, Actal operating time added to 'production order operations' - auto fetched based on 'time log' creation 'make time log' button appears only if 'production order' document is submitted server side validation added to check if 'Production Order' mentioned on 'Time Log' is in submit state test cases added to check all of the above Time Log Bug Fixed Manufacturing seetings doctype added. prod order holiday list time calculation added	2014-12-23 17:38:59 +05:30
Neil Trini Lasrado	5ec7542519	Holiday List name changed and workstation filter added to time log	2014-12-23 17:38:59 +05:30
Neil Trini Lasrado	637d804abd	Operations added in Production Order DocType Auto-Fetch added to operations in Production Order DocType made operations in production order read-only capacity & duration of cycle added to workstation workstation operation timings added operation master added, Time log added Time Log Fixed Test Records added to Production Order Test Recorde for over Production Time Log added Validation added to check if time log timings are within working hours of the workstation. Validation added to check if workstation is closed on time log dates. Test Case added for Time Log	2014-12-23 17:38:59 +05:30
Anand Doshi	f87a622ef0	[minor] use frappe.attach_print() in salary slip and recurring document	2014-12-15 23:14:35 +05:30
Nabin Hait	606af96c9f	minor fix	2014-12-15 11:57:19 +05:30
Neil Trini Lasrado	e1f21682fb	changes made	2014-12-12 13:09:42 +05:30
Neil Trini Lasrado	f13c4f0145	New feature for issue #2419	2014-12-12 12:33:55 +05:30
Nabin Hait	5cafcf66b0	Leave application fix	2014-12-10 23:59:04 +05:30
Nabin Hait	690bcd7b66	Added leave approver name field in leave application	2014-12-09 16:36:33 +05:30
Rushabh Mehta	3d65d9602e	[error-reports]	2014-11-28 14:58:43 +05:30
Rushabh Mehta	6d950d23a8	[merge]	2014-11-28 12:08:51 +05:30
Nabin Hait	eba88919c1	Merge pull request #2431 from mayur-patel/patch-2 Update leave_application.py : Modified get_holidays function	2014-11-25 10:55:11 +05:30
Nabin Hait	ea91d2aaf1	Merge pull request #2429 from ankitjavalkarwork/expclaimname Add configurable naming series to Expense claim	2014-11-25 10:51:03 +05:30
Mayur Patel	5d8635a8dc	Update leave_application.py See issue #2422 for more detail.	2014-11-24 16:57:53 +00:00
ankitjavalkarwork	7e911bae95	Add configurable naming series to Expense claim	2014-11-24 18:26:17 +05:30
Nabin Hait	0ad7db3bbd	Minor fix in salary slip net total calculation	2014-11-24 15:25:13 +05:30
ankitjavalkarwork	16e2c18c64	Delete events linked with employee on deletion of Employee	2014-11-10 18:08:23 +05:30
Nathan Do	8a55d9a795	Remove get_server_field from leave_application - Make get_holidays and get_total_leave_days global to module - Replace get_server_field with using whitelisted function get_total_leave_days	2014-11-05 12:32:57 +08:00
Nabin Hait	a5082d6233	Merge pull request #2283 from neilLasrado/employee-reports-to employee cannot report to himself validation added to employee doctype	2014-10-10 15:20:13 +05:30
Neil Trini Lasrado	9b08062bed	employee cannot report to himself validation added to employee doctype	2014-10-09 17:26:17 +05:30
Neil Trini Lasrado	9614b552fd	fiscal year auto-fetch added to c-form, installation_note, stock_reconciliation, customer_issue, maintanence_visit & removed for Expense Claim	2014-10-09 15:01:12 +05:30
Neil Trini Lasrado	565d986198	fiscal year auto fetch added to oppurtunity, quotation, material request, supplier quotation, expense claim doctypes + issues fixed	2014-10-09 15:01:12 +05:30
Nabin Hait	c68646c694	[merge] 4.x to 5.0	2014-10-06 12:57:48 +05:30
Rushabh Mehta	bf8715dba4	[refactor] used frappe.sendmail	2014-09-16 15:12:18 +05:30
Rushabh Mehta	5cdc8e560c	[mailbox] removed separate email settings for jobs, sales, support	2014-09-16 15:12:18 +05:30
Rushabh Mehta	e10cf021d9	[email] remove communicationlist #561	2014-09-16 15:12:18 +05:30
Rushabh Mehta	ce00772ac0	[cleanup] removed communication js, fields	2014-09-16 15:11:42 +05:30
Rushabh Mehta	c0bb453b88	[refactor] [frappe 5.0]	2014-09-16 15:10:54 +05:30
Rushabh Mehta	ed37cef32a	[refactor modules]	2014-09-16 15:08:02 +05:30
Anand Doshi	30c5b41398	[minor] removed Suggest	2014-09-15 16:43:34 +05:30
81552433qqcom	1c440b3b31	month options doesn't get translated.	2014-09-12 16:07:12 +05:30
81552433qqcom	951da0ca3d	added translations to report py file.	2014-09-12 16:07:12 +05:30
Anand Doshi	fc33d5a75b	Set allow_on_submit for 'page_break', 'letter_head', 'select_print_heading', 'print_heading'. Fixes frappe/erpnext#1810	2014-09-09 15:25:43 +05:30
Anand Doshi	0b74b6d98c	[fix] Validate Expense Approver	2014-09-05 14:41:53 +05:30
Anand Doshi	bb370f3b6a	HR - Leave Approver and Expense Approver fields changed to Link Fields, better default permissions	2014-08-29 11:19:10 +05:30
Rushabh Mehta	e8dd4160d4	[cleanup] remove allow_attach	2014-08-25 13:04:21 +05:30
Anand Doshi	e4c434ab6f	[fix] Leave Application Calendar	2014-08-18 17:04:04 +05:30
Rushabh Mehta	ab8bde0149	[ux] added folds, show actual / projected qty in pos	2014-08-14 11:43:46 +05:30
Anand Doshi	26201a5828	[fix] Show Employee Name in Employee Birthday report	2014-08-08 12:49:11 +05:30
Anand Doshi	4cc94df752	[tests] Fixed Test Records	2014-08-08 11:56:32 +05:30
Rushabh Mehta	7a4e739d6c	templating for hr	2014-08-08 11:56:32 +05:30
Rushabh Mehta	8544447b19	added more listview templates	2014-08-08 11:56:32 +05:30
Rushabh Mehta	995185d02d	[ux] fixed primary action	2014-08-08 11:51:23 +05:30
Nabin Hait	7881df2138	minor fix	2014-08-06 17:29:07 +05:30
Nabin Hait	9f7e00bb3a	Send salary slip mail after submit via Salary Manager	2014-08-06 17:25:23 +05:30
Nabin Hait	45b7d17ee8	Employee can be reselected but not changed in salary structure	2014-08-06 17:25:23 +05:30
Anand Doshi	35cc320e21	[fixes] Leave Application and Toggle Rounded Totals	2014-07-30 17:00:26 +05:30
nabinhait	16317748dd	Issue fixes related to length of the report result	2014-07-28 16:41:34 +05:30
Anand Doshi	62b1cbf003	[impact] Limit available functions in jinja environment	2014-07-25 13:02:29 +05:30
Anand Doshi	a5437cdac1	Fixes for print	2014-07-25 13:02:28 +05:30
Rushabh Mehta	5b51cc86a9	many fixes to print	2014-07-25 13:01:53 +05:30
Anand Doshi	df7f1c17ac	Fixed Employee Birthday Report	2014-07-02 17:35:00 +05:30
Anand Doshi	4aa2380de2	Fixed get_sender for Sales and Jobs	2014-06-30 12:19:22 +05:30
Anand Doshi	83da92fdcc	Naming Series Property Setter Patch	2014-06-23 18:04:07 +05:30
Anand Doshi	31c977b906	Fixed Employee Leave Balance Report	2014-06-18 16:26:45 +05:30
Nabin Hait	589a298096	Minor fixes in salary manager. Fixes #1754	2014-06-11 13:00:31 +05:30
Anand Doshi	04badf7e6e	Hotfix: module name case for HR	2014-06-06 15:29:55 +05:30
Anand Doshi	171c00cfd6	Reload permissions for master and setting documents	2014-06-06 15:13:20 +05:30
Anand Doshi	ede8ea52b0	Fixes	2014-06-05 18:06:20 +05:30
Rushabh Mehta	41471c3b44	fixed description in salary manager	2014-06-05 16:01:55 +05:30
Anand Doshi	85479bcbc0	Fixes for apply user permissions and momentjs	2014-06-04 18:15:43 +05:30
Anand Doshi	ec8240e890	Apply User Permissions optional in Script and Query Reports	2014-06-04 17:48:58 +05:30
Anand Doshi	38dedf402b	Fixes in patches for migration	2014-06-04 17:48:56 +05:30
Anand Doshi	c280d0655c	Set Employee Name if missing	2014-06-04 17:48:56 +05:30
Anand Doshi	cdc1b640d9	Fixes in user permissions patches	2014-06-04 17:48:56 +05:30
Anand Doshi	4985691617	Role and User Permissions	2014-06-04 17:48:54 +05:30
Anand Doshi	69eec9e344	Role and User Permissions	2014-06-04 17:48:54 +05:30
Anand Doshi	a8ce570635	Permission relogication continued	2014-06-04 17:48:53 +05:30
Anand Doshi	fab0904af7	Started permission relogication	2014-06-04 17:48:52 +05:30
Nabin Hait	fb988ba834	Salary Slip: pull details from salary struture. fixes #1719	2014-05-30 15:53:20 +05:30
Nabin Hait	1897e75894	Remove blank lines from uploaded file of attendance #1714	2014-05-30 14:31:10 +05:30
Rushabh Mehta	a39cae9c2e	added title field to support ticket, lead and employee	2014-05-21 17:34:22 +05:30
Nabin Hait	2e0620e370	Server side onload functionality in multiple docs	2014-05-19 18:15:58 +05:30
Nabin Hait	ad68d64d93	Leave approver select options in leave application and employee	2014-05-16 19:56:43 +05:30
Nabin Hait	bc7659ab90	Employee leave balance report fixes #1647	2014-05-15 11:37:12 +05:30
Anand Doshi	54b7962eb9	Pass frm to open_mapped_doc	2014-05-14 17:38:45 +05:30
Nabin Hait	aade34b0c9	Reports and print formats modified for renamed fields	2014-05-13 16:12:37 +05:30
Rushabh Mehta	409c8e9732	removed confirmation date validations (wtf)	2014-05-11 10:01:16 +05:30
Rushabh Mehta	75e11a7270	Merge pull request #1616 from pdvyas/migrate-3to4 3 to 4 migration fixes	2014-05-10 22:19:07 +05:30
Pratik Vyas	95f558e7bc	fix update user properties patch	2014-05-10 22:16:39 +05:30
Anand Doshi	78e9c6ef70	Deprecate Select fields with options as link:	2014-05-09 13:36:13 +05:30
Anand Doshi	f410bd9bf9	Better default permissions, ignore_restrictions for defaults, removed field trash_reason Additions: Account --> Material User: Read Cost Center --> Sales User, Purchase User: Read Mode of Payment --> Accounts User: Read Supplier --> Material User, Accounts User: Read Employee --> Employee: Restricted Read Leave Type --> Employee: Read Production Order --> Material User: Read Sales Order --> Material User: Read Print Heading --> All: Read Terms and Conditions --> Purchase User, Material User: Read Territory --> Material User, Maintenance User: Read Item --> Sales User, Purchase User, Maintenance User, Accounts User: Read Price List --> Manufacturing User: Read Purchase Receipt --> Accounts User: Read Warehouse --> Manufacturing User: Read	2014-05-07 17:20:42 +05:30
Anand Doshi	8c2dbab878	Changed default naming series options C-Form: C-FORM-.##### Purchase Invoice: PINV-.##### Sales Invoice: SINV-.##### Purchase Order: PO-.##### Quality Inspection: QI-.##### Supplier: SUPP-.##### Supplier Quotation: SQTN-.##### Attendance: ATT-.##### Production Order: PRO-.##### Installation Note: IN-.##### Lead: LEAD-.##### Opportunity: OPTY-.##### Quotation: QTN-.##### Sales Order: SO-.##### Delivery Note: DN-.##### Item: ITEM-.##### Material Request: MREQ-.##### Packing Slip: PS-.##### Purchase Receipt: PREC-.##### Stock Entry: STE-.##### Customer Issue: CI-.##### Support Ticket: SUP-.##### Customer: CUST-.##### Journal Voucher: JV-.#####	2014-05-06 19:43:11 +05:30
Anand Doshi	37909b292f	Remove India specific fields	2014-05-06 16:15:56 +05:30
Nabin Hait	02d37bbb5a	Allow Rename option added in multiple docs. Fixes #1521	2014-05-06 12:18:50 +05:30
Anand Doshi	648062d071	Fixes in test cases	2014-05-05 16:46:38 +05:30
Anand Doshi	b71a18cd1e	Leave Allocation Tool and Employee. Fixes #1555	2014-05-02 16:23:51 +05:30
Anand Doshi	f29bcaf436	Added new fixtures (Fixes #1540 ). Removed Employee Grade from HR.	2014-05-02 13:55:07 +05:30
Anand Doshi	51e6d2228d	Salary Slip - read permission for Employee. Fixes #1553	2014-05-01 16:28:13 +05:30
Anand Doshi	d9f0f27cd4	Fixes in test cases	2014-04-30 22:16:25 +05:30
Rushabh Mehta	a15164750d	started client side testing using selenium and other related and unrelated fixes	2014-04-30 19:39:13 +05:30
Anand Doshi	69aa8ffac4	Fixed as_dict of employee.py	2014-04-28 16:51:34 +05:30
Anand Doshi	1872312cc6	Deprecated client side mapper: frappe.model.map. Fixes #1530	2014-04-25 18:38:08 +05:30
Anand Doshi	8bde7f9b3a	Conditionally toggle Naming Series. Fixes #1526	2014-04-24 18:11:49 +05:30
Anand Doshi	3e41fd1fd3	List route for tree browser based doctypes; Fixes to add child in tree browsers	2014-04-22 18:55:21 +05:30
Anand Doshi	07339fc69e	Fixes in Setup Wizard and Attachments	2014-04-22 15:30:24 +05:30
Anand Doshi	424c033395	Removed controller.py	2014-04-21 15:06:56 +05:30
Anand Doshi	cbbf451974	Fixes throw	2014-04-21 11:33:49 +05:30
Rushabh Mehta	c38fc713c6	updated translations	2014-04-16 17:46:30 +05:30
Nabin Hait	450d9d72d7	Minor fix in monthly attendance report Cherry-picked and modified by @anandpdoshi Conflicts: hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py	2014-04-16 15:23:09 +05:30
Rushabh Mehta	ff93802d58	more message fixes	2014-04-15 18:40:31 +05:30
Rushabh Mehta	8a40c136ce	more message fixing	2014-04-15 16:31:20 +05:30
Pratik Vyas	f37d6fe32b	Merge pull request #1514 from frappe/js-translate-refactor JS translation refactor	2014-04-15 11:44:16 +05:30
Rushabh Mehta	354b32177d	fix for leave application test	2014-04-14 22:23:41 +05:30
Rushabh Mehta	9f0d625300	update translation strings #1403	2014-04-14 19:20:45 +05:30
Pratik Vyas	b0f279a34e	js translations refactor	2014-04-14 17:14:23 +05:30
Pratik Vyas	b52618c142	frappe._ to __	2014-04-14 16:25:30 +05:30
Rushabh Mehta	558a9aabfb	removed control panel	2014-04-04 12:00:36 +05:30
Rushabh Mehta	0cf531c8a6	frappe/frappe#478 fixes	2014-04-03 17:43:06 +05:30
Rushabh Mehta	f14b809ab5	frappe/frappe#478 , more changes, removed bean	2014-04-03 14:30:42 +05:30
Rushabh Mehta	f191f854cd	frappe/frappe#478 erpnext install works	2014-04-02 18:09:34 +05:30
Rushabh Mehta	f2227d033c	frappe/frappe#478 , removed instances of .fields	2014-03-31 23:37:40 +05:30
Rushabh Mehta	231f6a5b58	frappe/frappe#478 added test_records.json	2014-03-31 23:05:12 +05:30
Rushabh Mehta	0a0f2495a2	frappe/frappe#478 , frappe tests pass, .txt renamed to .json	2014-03-31 17:27:06 +05:30
Nabin Hait	0e13cd5ac9	frappe/frappe#478	2014-03-28 17:01:32 +05:30
Nabin Hait	0d8d30e1cc	frappe/frappe#478	2014-03-28 16:57:21 +05:30
Rushabh Mehta	b385ecf65e	frappe/frappe#478	2014-03-28 16:54:45 +05:30
Anand Doshi	43405203b2	frappe/frappe#478	2014-03-28 16:43:50 +05:30

... 13 14 15 16 17 ...

1569 Commits