Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,571 Commits 3 Branches 0 Tags 1 GiB
d1f15b2a88
Commit Graph

118 Commits

Author SHA1 Message Date
Sagar Vora
95e9b2fd6e
refactor(payroll): simplified logic for additional salary (#24907) 2021-03-17 19:58:56 +05:30
Deepesh Garg
11092d0824 feat: Additon of leave details in Salary Slip (#24674) 
* feat: Additon of leave details in Salary Slip

* fix: Change leaves to leave
 2021-03-02 18:38:31 +05:30
Nabin Hait
d46b23699c
fix: optimize reposting of gle and sle (#24702) 
* fix(india): escape for special characters in JSON (#24695)

JSON does not accept special whitespace characters like tab, carriage
return, line feed

Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf

Related issue: ISS-20-21-09811

* fix: Accounting Dimension creation background job timeout

* fix(regional): vehicle no is mandatory for ewaybill generation (#24679)

* fix: vehicle no required for e-invoice

* fix: ewaybill generation dialog condition

* fix: excluding unidentified accounts from gstr-1

* fix: optimize reposting of sle and gle (#24694)

* fix: optimize update_gl_entries_after method

* fix: Optimized reposting patch

* fix: accounting dimensions

* added reload_doc in patch

* Update item_reposting_for_incorrect_sl_and_gl.py

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>

* fix: Replaced spaces with tabs

* fix: merge conflict

* fix: test cases

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2021-02-23 16:38:52 +05:30
Jannat Patel
4cef0f5983 fix: salary slip attribute error (#24455) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-02-18 21:30:13 +05:30
Afshan
83768b68c1 fix: emp disappear (#24525) 
* fix: emp disappear

* fix: renamed set_totals_call to set_totals

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-18 21:20:14 +05:30
Afshan
c0f8f32801
fix: fetch query for employee (#24529) 2021-02-02 20:27:23 +05:30
Afshan
10b00f9d0d
fix: separation of salary creation from payroll (#24528) 
* fix: separation of salary creation from payroll

* fix: removed unnecessary veriable

* fix: check existing sal slips

* fix: existing checks

* style: refactoring query
 2021-02-02 16:24:01 +05:30
Afshan
8676089794
fix: emp disappear (#24524) 
* fix: emp disappear

* fix: renamed set_totals_call to set_totals

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-02 11:02:22 +05:30
Nabin Hait
a6213ccd61 Merge branch 'develop' into version-13-beta-pre-release 2021-01-28 17:36:08 +05:30
Afshan
907e2990d0
fix: remove function to get earning deduction components (#24465) 
* fix: remove function to get earning deduction components

* fix: slider
 2021-01-27 15:34:42 +05:30
Suraj Shetty
0c34a711eb Merge branch 'develop' of github.com:frappe/erpnext into version-13-beta-pre-release 2021-01-25 16:06:38 +05:30
Afshan
217440952f fix: slider 2021-01-22 15:39:59 +05:30
Afshan
02d495f1fb fix: added query for fetching salary component 2021-01-22 15:39:59 +05:30
Afshan
36e3e05a0e fix: query for salary componet in salary structure 2021-01-20 16:48:42 +05:30
Afshan
912647f4f2 fix: allow statistical component in salary structure. 2021-01-20 13:58:32 +05:30
Afshan
c69ab6d184 fix: select sal comp while making sal struct 2021-01-19 19:29:31 +05:30
Deepesh Garg
6fb66f9428
Merge pull request #24362 from ruchamahabal/year-to-date-in-salary-components 
feat(Payroll): compute Year to Date for Salary Slip components
 2021-01-19 09:40:47 +05:30
Deepesh Garg
cbed6f970a Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2021-01-15 15:43:59 +05:30
Rucha Mahabal
6c90e26982 feat: add descriptions for YTD and MTD fields 2021-01-14 13:42:40 +05:30
Rucha Mahabal
49702c1487 test: year to date computation for salary slip components 2021-01-14 11:57:24 +05:30
Rucha Mahabal
2c315a738e feat: Salary Slip with Year to Date Print Format 2021-01-14 10:06:24 +05:30
Rucha Mahabal
fdad94f983 feat(Payroll): compute Year to Date for Salary Slip components 2021-01-14 00:40:58 +05:30
Afshan
33fac19bce
fix: calculation of remaining_sub_periods if relieving date before month start date (#24319) 2021-01-13 21:06:04 +05:30
Rucha Mahabal
a93151502c fix: Components formulated from additional salary not being fetched in Payroll Entry 2021-01-08 12:10:26 +05:30
Anurag Mishra
77ba72c4ff
Merge branch 'develop' into payroll_fixes2.0 2021-01-06 14:23:53 +05:30
Anurag Mishra
e7fa6f6a1c fix: edditable employee grid 2021-01-06 13:25:09 +05:30
Shivam Mishra
9fc44f1606
Merge pull request #24182 from scmmishra/fix-dont-set-primary 2021-01-06 12:52:44 +05:30
Deepesh Garg
ad8be7c1fe fix: Consider only submitted salary slips 2021-01-06 09:29:03 +05:30
Nabin Hait
f7b9b0687e
fix: tax calculation on salary slip for the first month (#24272) 
* fix: tax calculation on salary slip for the first month

* fix: net pay precision issue

* fix: net pay precision issue

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2021-01-05 20:43:11 +05:30
Deepesh Garg
b01b108dfa fix: do not consider current salary slip in sum 2021-01-05 17:34:16 +05:30
Saurabh
994fa48cd4
Merge branch 'develop' into fix-dont-set-primary 2021-01-05 16:32:56 +05:30
Nabin Hait
517fd8b9e6
fix: Ignore customer and supplier while deleting company transactions (#24279) 
* fix: Ignore customer and supplier while deleting company transactions

* fix: Test cases fixed based on Travis
 2021-01-05 09:23:39 +05:30
Deepesh Garg
797a742cb2 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2021-01-04 14:24:00 +05:30
Afshan
47bc42740b
Merge branch 'develop' into fix-sal-struc-assign-payroll-acc 2020-12-31 17:41:44 +05:30
Anurag Mishra
d7ea2bd705
Merge pull request #24177 from AfshanKhan/fix-perm-empl-sal-slip 
fix: error popup for submitted doc
 2020-12-31 17:07:30 +05:30
Afshan
8b60fe6125 fix: setting correct account for sal struct assignment if not specified. 2020-12-31 16:10:39 +05:30
Deepesh Garg
133ce286f9 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-31 11:24:14 +05:30
Deepesh Garg
5891b48cf6
Merge pull request #24176 from GangaManoj/Year-to-Date 
feat: Add year_to_date field (cumulative salary for a fiscal year)
 2020-12-30 16:53:47 +05:30
Deepesh Garg
66dcaf3ab2 fix: Salary structure assignment in tests 2020-12-30 15:47:22 +05:30
Deepesh Garg
97d055dfc3 fix: Test Case 2020-12-30 14:06:13 +05:30
Deepesh Garg
8b7ebe5044 fix: Test Case cleanup and fixes 2020-12-30 12:45:46 +05:30
Deepesh Garg
20133bd1df fix: Remove comments 2020-12-29 22:19:12 +05:30
Deepesh Garg
353f8f4d85 fix: Add test case for YTD 2020-12-29 22:13:40 +05:30
Deepesh Garg
60b77f9865 Merge branch 'develop' of https://github.com/frappe/erpnext into Year-to-Date 2020-12-29 18:26:32 +05:30
Deepesh Garg
4a8c2c4cb5 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-29 15:10:36 +05:30
Anurag Mishra
527a156512 feat: validated employees whose salary has been already precessed 2020-12-24 13:59:12 +05:30
Anurag Mishra
d556847fca fix: allow addition and removal of employee in payroll Entry 2020-12-23 12:59:48 +05:30
Afshan
adf9b49e14 fix: sal slip popup error 2020-12-23 11:39:38 +05:30
Ganga Manoj
090783804b fix: Improve month_to_date computation 2020-12-21 23:52:05 +05:30
Ganga Manoj
c36cab81f2 fix: Update year_to_date and month_to_date field labels to show company currency 2020-12-21 23:46:02 +05:30