Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,927 Commits 3 Branches 0 Tags 1 GiB
06ef4270f2
Commit Graph

1275 Commits

Author SHA1 Message Date
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